diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:28:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:33:28 +0100 |
| commit | b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99 (patch) | |
| tree | 995999c8e7b5fb523a0141618cae43e9866411ac /libavformat/subfile.c | |
| parent | 34e325efa5d05508c182d0753dd5fd00e95502eb (diff) | |
| parent | 75177b2f5e18aeb74fffd382225dbc6926af0583 (diff) | |
| download | ffmpeg-b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: check color_range
Conflicts:
libavcodec/libx264.c
See: 48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subfile.c')
0 files changed, 0 insertions, 0 deletions