diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:44:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:44:24 +0100 |
| commit | 7801f3e509acf4adee00ac765c54a8835e8dba8e (patch) | |
| tree | 84184692fe3ab2a52efbfe2ff1de80cb301116a6 | |
| parent | 240d7a7fc209852f953852f568c962e66094f6c4 (diff) | |
| parent | ec0df23765bd41846f66e4a4fb694779b432fc62 (diff) | |
| download | ffmpeg-7801f3e509acf4adee00ac765c54a8835e8dba8e.tar.gz | |
Merge commit 'ec0df23765bd41846f66e4a4fb694779b432fc62' into release/0.10
* commit 'ec0df23765bd41846f66e4a4fb694779b432fc62':
h264: Remove an assert on current_picture_ptr being null
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 981adb48a4..e726fd8019 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3115,7 +3115,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } else { /* Frame or first field in a potentially complementary pair */ - assert(!s0->current_picture_ptr); s0->first_field = FIELD_PICTURE; } |