diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:24:37 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:24:48 +0100 |
commit | 8d86e7b495896946f5e3c8751f06b2fd11d8213c (patch) | |
tree | 3782a5f0f619047270b9682591e792743272f987 /libavcodec/vc1dec.c | |
parent | 0db6402d9116b826fdf7f35409d229358ad81fd3 (diff) | |
parent | 060667195e6e6bc0fa63ce13c47e23aabe70d122 (diff) | |
download | ffmpeg-8d86e7b495896946f5e3c8751f06b2fd11d8213c.tar.gz |
Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'
* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122':
hevc: rename some HEVC conformance streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
0 files changed, 0 insertions, 0 deletions