diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:48:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:48:57 +0200 |
commit | e4b1cffadef2396746f29ed30fe340b33ab9fa82 (patch) | |
tree | a4f3ebe0f9f884a904c876443f21bf2545833e3a /cmdutils.c | |
parent | 06f7e87e15a6dd15a9fe0e1f0bfa9f72c8886475 (diff) | |
parent | af9b62654d5aa023a96906215365532d18541a09 (diff) | |
download | ffmpeg-e4b1cffadef2396746f29ed30fe340b33ab9fa82.tar.gz |
Merge commit 'af9b62654d5aa023a96906215365532d18541a09' into release/1.1
* commit 'af9b62654d5aa023a96906215365532d18541a09':
svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions