aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp3.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-10 00:15:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-10 00:19:43 +0200
commitefc66d69bfb622e874d883e0b304cf18b12e41bd (patch)
tree01adc68c2448e4f1950c37348db09790b092f875 /libavcodec/vp3.c
parentcd0dc88751db969964e7b40c4d4b5fd446ac1589 (diff)
parent0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50 (diff)
downloadffmpeg-efc66d69bfb622e874d883e0b304cf18b12e41bd.tar.gz
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50': hevc: parse display orientation SEI message Conflicts: libavcodec/hevc.h libavcodec/hevc_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3.c')
0 files changed, 0 insertions, 0 deletions