diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 14:12:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 14:12:46 +0200 |
| commit | b06e82e73897e7afd1363f60015f5cbf6d39c984 (patch) | |
| tree | 74177e40f4d6737307317a177055f8ed749c69ae /libavcodec/jpeg2000dec.c | |
| parent | 5a3d2541bd59b52e9357f3f55499e98c3d4e522a (diff) | |
| parent | 4792fb94098cf47bd8caf9b3a9795c666bae2220 (diff) | |
| download | ffmpeg-b06e82e73897e7afd1363f60015f5cbf6d39c984.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/x264: Support bgr0 as input pix_fmt.
lavf: Use av_codec_get_tag2() in avformat_query_codec().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
0 files changed, 0 insertions, 0 deletions