diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 22:13:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 22:13:42 +0100 |
| commit | 6b06f9f1bc4c51a96186021bf0f99599e49aff47 (patch) | |
| tree | 4ad4bfbdca41249f208238a065b33950213f6b10 /libavcodec/h264_parser.c | |
| parent | fc10ed2cac71d8bcda80afdb8f1a3112b854fbd5 (diff) | |
| parent | 39c2880eeae6930b1036ce1f479afc1e1152c13f (diff) | |
| download | ffmpeg-6b06f9f1bc4c51a96186021bf0f99599e49aff47.tar.gz | |
Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
af_volume: preserve frame properties
Conflicts:
libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
0 files changed, 0 insertions, 0 deletions