diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 23:49:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 23:49:33 +0200 |
| commit | 7caaa72e624812e87c25af456310599f2e091b1c (patch) | |
| tree | e47a6b07d2eabedcf0413413e61161fa6e6827b5 /libavcodec/mjpegdec.c | |
| parent | 43497d8a838e21e7327452a52c75d397f004d7d3 (diff) | |
| parent | 43353bf32c928ea52bdca786bb09eb490dbe8477 (diff) | |
| download | ffmpeg-7caaa72e624812e87c25af456310599f2e091b1c.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
libxvid: guess a good aspect when we cant store the exact one.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
0 files changed, 0 insertions, 0 deletions