aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dxva2_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-13 08:27:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-13 08:28:05 +0200
commitb6ffe8afd92860a4605f12ac61226dac5e0c03cb (patch)
treea116bc4bd49ed792ed468228de3dfe93a09f0d8f /libavcodec/dxva2_internal.h
parent40ade0714110d26d9b520b457a851209e4851e99 (diff)
parent9c15ef35d404fca2adc31276c1eedb11cf485461 (diff)
downloadffmpeg-b6ffe8afd92860a4605f12ac61226dac5e0c03cb.tar.gz
Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'
* commit '9c15ef35d404fca2adc31276c1eedb11cf485461': oggparsevorbis: support official chapter extension Conflicts: libavformat/oggparsevorbis.c See: 04b9836274f390e39879c2666f7967990f0382cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2_internal.h')
0 files changed, 0 insertions, 0 deletions