[FFmpeg-cvslog] ffmpeg: do not give away our reference to the frame.

Nicolas George git at videolan.org
Sun Mar 10 02:03:01 CET 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Mar  9 21:19:23 2013 +0100| [4e7c61b7a722797c60532fc06726546c8f82052b] | committer: Michael Niedermayer

ffmpeg: do not give away our reference to the frame.

Note: the logic here is temporary until the updates to
ffmpeg.c are merged.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e7c61b7a722797c60532fc06726546c8f82052b
---

 ffmpeg.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 20f016c..33d5783 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1737,7 +1737,8 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
                                  AV_BUFFERSRC_FLAG_NO_COPY |
                                  AV_BUFFERSRC_FLAG_PUSH);
         } else
-        if(av_buffersrc_add_frame_flags(ist->filters[i]->filter, decoded_frame, AV_BUFFERSRC_FLAG_PUSH)<0) {
+        if(av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame)<0) {
+            /* TODO add back AV_BUFFERSRC_FLAG_PUSH */
             av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
             exit(1);
         }



More information about the ffmpeg-cvslog mailing list