diff options
| author | Jeff Downs <heydowns@borg.com> | 2007-10-04 06:43:58 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2007-10-04 06:43:58 +0000 |
| commit | f57e2af68bb58d67c32612fb3e70a47b13d66695 (patch) | |
| tree | e141690cfe45b534118d5e04a384b9667ce4c91a | |
| parent | c58b7471530e5a92b857cf82febf345c57c1295a (diff) | |
| download | ffmpeg-f57e2af68bb58d67c32612fb3e70a47b13d66695.tar.gz | |
Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support.
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30
Originally committed as revision 10663 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 26950022a8..b1bb071244 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3742,7 +3742,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ h->curr_pic_num= h->frame_num; h->max_pic_num= 1<< h->sps.log2_max_frame_num; }else{ - h->curr_pic_num= 2*h->frame_num; + h->curr_pic_num= 2*h->frame_num + 1; h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); } diff --git a/libavcodec/h264.h b/libavcodec/h264.h index d9a668c7b1..1c9d4e4c1e 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -285,7 +285,7 @@ typedef struct H264Context{ int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 /** - * frame_num for frames or 2*frame_num for field pics. + * frame_num for frames or 2*frame_num+1 for field pics. */ int curr_pic_num; |