virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'

Browse Source 
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
  nutenc: check for negative index rather than assert

Conflicts:
	libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-22 00:09:00 +02:00
commit dd3f1563d7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/nutenc.c
View File

@ -1119,6 +1119,7 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
av_assert0(frame_code != -1); av_assert0(frame_code != -1);
fc = &nut->frame_code[frame_code]; fc = &nut->frame_code[frame_code];
flags = fc->flags; flags = fc->flags;
needed_flags = get_needed_flags(nut, nus, fc, pkt); needed_flags = get_needed_flags(nut, nus, fc, pkt);