aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vaapi_vc1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-05 16:13:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-05 16:18:15 +0200
commitba040d4c8c1e9d55d12a6759bfa4932c11454da4 (patch)
treee89e4e0698d5eba406228c637cb52bb7a1540129 /libavcodec/vaapi_vc1.c
parentdb9c138616c9babc3a0f02c6b7289c774cc5b65c (diff)
parent3828eb8519c1530392ab8820b1aa784602128afc (diff)
downloadffmpeg-ba040d4c8c1e9d55d12a6759bfa4932c11454da4.tar.gz
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'
* commit '3828eb8519c1530392ab8820b1aa784602128afc': libfdk-aac: Relicense the library wrappers to 2-clause BSD Conflicts: libavcodec/libfdk-aacdec.c libavcodec/libfdk-aacenc.c <Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers <Daemon404> so it should be fine to merge. Thanks-to: Martin Storsjö <martin@martin.st> Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_vc1.c')
0 files changed, 0 insertions, 0 deletions