diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:52:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:52:03 +0200 |
| commit | 2ad28840b3fb90d9f000b676853846792e05bd68 (patch) | |
| tree | f5d699cf49be342fdb1f5f07dba5750a9a6e7f87 /libavcodec/smacker.c | |
| parent | 91db8ff203048e3d6fed589e8352d3a5407d4302 (diff) | |
| parent | 538bf767373f176b6487e30181155e74b37cced6 (diff) | |
| download | ffmpeg-streaming-2ad28840b3fb90d9f000b676853846792e05bd68.zip ffmpeg-streaming-2ad28840b3fb90d9f000b676853846792e05bd68.tar.gz | |
Merge commit '538bf767373f176b6487e30181155e74b37cced6'
* commit '538bf767373f176b6487e30181155e74b37cced6':
avconv: make -aspect work with streamcopy
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smacker.c')
0 files changed, 0 insertions, 0 deletions
