diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:46:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:46:38 +0200 |
| commit | 185164398763b76729d6169bea35d08c48d1d32f (patch) | |
| tree | 27d0d0368c03a9f26718ed2d49bfe5319413288e /libavformat/srtp.h | |
| parent | cac07d0e103656a2436ea04b700128ce436a4d06 (diff) | |
| parent | b2c31710c96fa47d9dcd40b64d39663e8957f683 (diff) | |
| download | ffmpeg-185164398763b76729d6169bea35d08c48d1d32f.tar.gz | |
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtp.h')
0 files changed, 0 insertions, 0 deletions