diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-15 21:05:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-15 21:05:31 +0100 |
| commit | f3a862935d68f6b8f0b9432c39c5bb42fcf175d0 (patch) | |
| tree | c9020555b0e9fab3f4aa077c4c0105f7358fa874 /libswresample | |
| parent | 91126dc481a48400dd00cc45e98fb25520344874 (diff) | |
| parent | dc971acf4aa31fb5ffb37aad01e6f1fd8e90a0fa (diff) | |
| download | ffmpeg-f3a862935d68f6b8f0b9432c39c5bb42fcf175d0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264_parser: use enum values in h264_find_frame_end()
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions