diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 09:20:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-11 09:22:10 +0200 |
| commit | 08b22c0ea536813492c143c97197f7919921ce46 (patch) | |
| tree | 6903e716edcfbaf06c7b6bc42b51e655c70e1116 /libavformat/srtdec.c | |
| parent | bb8ce36dc28576d2abd10afc171499d6a9ce656a (diff) | |
| parent | 054454c63a2e07354c4bca8019a2f1e8060ffca8 (diff) | |
| download | ffmpeg-08b22c0ea536813492c143c97197f7919921ce46.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxf: Add jpeg2000 codec to intra only codecs
See: c461265a769e9ddadc2e3ee5b759937646fcc839
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtdec.c')
0 files changed, 0 insertions, 0 deletions