diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 12:02:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 13:13:12 +0200 |
| commit | 52ce6be86b6a4404ad5d7d92266ea6cbc103102f (patch) | |
| tree | d31d4fc93c42897c15743951339196f6ce9964c4 /libavcodec/h264chroma.c | |
| parent | 0a64fb7fb0bb2492fec338119f68b62954100959 (diff) | |
| parent | 48e50921337984ba4ec2c1cafe45d43787f84498 (diff) | |
| download | ffmpeg-52ce6be86b6a4404ad5d7d92266ea6cbc103102f.tar.gz | |
Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'
* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
avconv: make -shortest work with streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264chroma.c')
0 files changed, 0 insertions, 0 deletions