diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 03:23:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 03:23:47 +0200 |
| commit | 7a5537fd3fd06f71c077ef06467149390ed491ea (patch) | |
| tree | 42c73d0d1a1bacd480c4e7bd36a647a1f4b19585 /libavcodec/g722dec.c | |
| parent | a2c6a99ba56a8c4c4b5efb7474002de10e67bb06 (diff) | |
| parent | 90d93eeb386fc3cfd8669ad8007feefd372767e9 (diff) | |
| download | ffmpeg-7a5537fd3fd06f71c077ef06467149390ed491ea.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow .y as extension for image2.
Show stream number when warning about stream without start time.
Force gif aspect ratio multiplication to 64bit.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions