diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 00:45:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 00:45:08 +0200 |
| commit | bdccfc3fc354632f49721fc435310fb958843b21 (patch) | |
| tree | 620c1d613984edfbf1b6e873633290a43dbd7586 /libavformat/mpjpeg.c | |
| parent | 154c8bf60b65654ba28e47e5b38f70e1f1e5d90c (diff) | |
| parent | ae4c912bcecb5048611c4491a818d489ec828f59 (diff) | |
| download | ffmpeg-bdccfc3fc354632f49721fc435310fb958843b21.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Forward interlaced field information from mov to ffv1 decoder.
Do not suggest to use gas-preprocessor if using it would break compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpjpeg.c')
0 files changed, 0 insertions, 0 deletions