diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 01:17:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 01:17:49 +0200 |
| commit | 4a2bcdb28b510ae1378b82acf422f8c8ff8a4635 (patch) | |
| tree | d4853a92b57fe47e3a618e8833fd7a309dac8e8a /libavutil/camellia.h | |
| parent | edfcbf7c83cb7828c0531e788ba8c5c47b07fc5f (diff) | |
| parent | 1761ab838c75223a6b97d8c0720d09275374c53d (diff) | |
| download | ffmpeg-4a2bcdb28b510ae1378b82acf422f8c8ff8a4635.tar.gz | |
Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'
* commit '1761ab838c75223a6b97d8c0720d09275374c53d':
lavc: Deprecate avctx.rc_strategy
Conflicts:
libavcodec/mpegvideo.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/camellia.h')
0 files changed, 0 insertions, 0 deletions