diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 01:02:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 01:02:21 +0200 |
| commit | 7254afdf1c60f2786ff1f2a89e090f6c016ab85d (patch) | |
| tree | 7254e50defef2854a5793b5b16c10e56fbf308f6 /libavcodec/g722enc.c | |
| parent | 020c287f5ee51f06fd662f4ab79cb22acc5da204 (diff) | |
| parent | b1cc12d0e3aa9f800de1cd6ffa6a2c54e78b4e5d (diff) | |
| download | ffmpeg-7254afdf1c60f2786ff1f2a89e090f6c016ab85d.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: make -aspect work with -vcodec copy.
lavfi/vf_aspect: improve compatibility of parsing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions