diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:41:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:41:41 +0200 |
| commit | cac07d0e103656a2436ea04b700128ce436a4d06 (patch) | |
| tree | 26ad63f72adfeb90f1f5857cb5c458cdd2d77ff1 /libswresample/x86/swresample_x86.c | |
| parent | b7dd250b7545ece973bd4c92fd7f93ce042fa911 (diff) | |
| parent | 5fccedaa67390ccddd6347c8e1c71b7664558bcd (diff) | |
| download | ffmpeg-cac07d0e103656a2436ea04b700128ce436a4d06.tar.gz | |
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/swresample_x86.c')
0 files changed, 0 insertions, 0 deletions