diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-01 02:51:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-01 03:04:46 +0200 |
| commit | 9251942ca728e7807a2a95306415b27b36a8b8e7 (patch) | |
| tree | 1d65d4646f8d2e057739734d73374052ab822399 /libavcodec/mpeg4videodec.c | |
| parent | 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7 (diff) | |
| download | ffmpeg-streaming-9251942ca728e7807a2a95306415b27b36a8b8e7.zip ffmpeg-streaming-9251942ca728e7807a2a95306415b27b36a8b8e7.tar.gz | |
Fix mpeg4 padding bug detection with more than 128bit trash and slices.
Fixes ticket302
The second hunk is from anatoly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 6b7b4bf..7cc30c2 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -113,7 +113,7 @@ static inline int mpeg4_is_resync(MpegEncContext *s){ int bits_count= get_bits_count(&s->gb); int v= show_bits(&s->gb, 16); - if(s->workaround_bugs&FF_BUG_NO_PADDING){ + if(s->workaround_bugs&FF_BUG_NO_PADDING && !s->resync_marker){ return 0; } |
