diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 18:10:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 18:10:45 +0200 |
| commit | ed8c34a7666a2ad7a528492c3aeed00decb0c35e (patch) | |
| tree | 2f3699a8cb36ad73cbb51797c153a202e91a3f38 /libavformat/tty.c | |
| parent | 7203dbde3910b9be3345bc04667a01ecd9291445 (diff) | |
| parent | b39a6bbe7f43710d8e7163757c5aeef596878712 (diff) | |
| download | ffmpeg-ed8c34a7666a2ad7a528492c3aeed00decb0c35e.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix pix_fmt detection in the native jpeg2000 decoder.
lavf/concat: Never fail for sample aspect ratio 0:1.
lut3d: Fix reading 3dl files with leading comments.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tty.c')
0 files changed, 0 insertions, 0 deletions