diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
| commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
| tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /libavcodec/h264_direct.c | |
| parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
| parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) | |
| download | android_external_ffmpeg-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.tar.gz android_external_ffmpeg-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.tar.bz2 android_external_ffmpeg-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.zip | |
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 99c2ec1b97..1f2081017b 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -86,7 +86,7 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, if (!interl) poc |= 3; - else if( interl && (poc&3) == 3) //FIXME store all MBAFF references so this isnt needed + else if( interl && (poc&3) == 3) // FIXME: store all MBAFF references so this is not needed poc= (poc&~3) + rfield + 1; for(j=start; j<end; j++){ |