[FFmpeg-cvslog] h264: remove a useless svq3 condition

Anton Khirnov git at videolan.org
Wed Mar 13 13:22:57 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Mar  7 16:40:26 2013 +0100| [f08fefc4d099f2a1f2e3a6db3d340537e601f762] | committer: Anton Khirnov

h264: remove a useless svq3 condition

The svq3 decoder does not call ff_h264_frame_start() anymore.

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

 libavcodec/h264.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cad2520..de5ca40 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1802,11 +1802,8 @@ int ff_h264_frame_start(H264Context *h)
     /* We mark the current picture as non-reference after allocating it, so
      * that if we break out due to an error it can be released automatically
      * in the next ff_MPV_frame_start().
-     * SVQ3 as well as most other codecs have only last/next/current and thus
-     * get released even with set reference, besides SVQ3 and others do not
-     * mark frames as reference later "naturally". */
-    if (h->avctx->codec_id != AV_CODEC_ID_SVQ3)
-        h->cur_pic_ptr->reference = 0;
+     */
+    h->cur_pic_ptr->reference = 0;
 
     h->cur_pic_ptr->field_poc[0] = h->cur_pic_ptr->field_poc[1] = INT_MAX;
 



More information about the ffmpeg-cvslog mailing list