diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:07:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:07:04 +0200 |
| commit | cd0dc88751db969964e7b40c4d4b5fd446ac1589 (patch) | |
| tree | 287290217843c6aeefc76b1f0ed9ada495820bba /libavcodec/arm/lossless_audiodsp_init_arm.c | |
| parent | c67690f854452df397f3f735d0ff107a3fe51d87 (diff) | |
| parent | 18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09 (diff) | |
| download | ffmpeg-cd0dc88751db969964e7b40c4d4b5fd446ac1589.tar.gz | |
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
h264: parse display orientation SEI message
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/lossless_audiodsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions