diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 20:33:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 20:33:51 +0200 |
commit | e77270cd93e1e77e99fb6d210e3bea0db9909ac4 (patch) | |
tree | d2749a537b6a2f91b4ca65325534cac6da19c425 /libavcodec/libx265.c | |
parent | 72a580268ff92b1909102b26c1c5fce9086f20e4 (diff) | |
parent | 783df7d5c5ab15f3d1afe2541c7d461c81c5c29d (diff) | |
download | ffmpeg-e77270cd93e1e77e99fb6d210e3bea0db9909ac4.tar.gz |
Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'
* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
riff: Add 'M705' FourCC for mpeg2video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx265.c')
0 files changed, 0 insertions, 0 deletions