aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-20 01:00:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-20 01:05:46 +0200
commit45283653a30e33a8ef0e35f2f6f502de2f93ce22 (patch)
tree59f9df323a80bc716c148b63d93c51a7bdb15cca /libavcodec/aacps.c
parent6af1793dd5a26b0617b31b0165f94d4bfc7c5160 (diff)
parente0fcad77618a0455ca9c2451ea0aa538597a08c0 (diff)
downloadffmpeg-45283653a30e33a8ef0e35f2f6f502de2f93ce22.tar.gz
Merge commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0' into release/1.1
* commit 'e0fcad77618a0455ca9c2451ea0aa538597a08c0': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacps.c')
0 files changed, 0 insertions, 0 deletions