aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/flac_picture.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 17:00:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 17:00:56 +0200
commit9cedb88f46b5a645cbd01986646e770593fe0ba4 (patch)
tree310ce55001c67ab7345f8b37ff65e7f04f5577b8 /libavformat/flac_picture.c
parent030c20ffcf042366213eb25b71adf5a2dfd04403 (diff)
parent674b79148ff29f40cbd569f5585bf99c71204bf5 (diff)
downloadffmpeg-9cedb88f46b5a645cbd01986646e770593fe0ba4.tar.gz
Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'
* commit '674b79148ff29f40cbd569f5585bf99c71204bf5': hevc: Fix HWACCEL_MAX for D3D11 See: 688147cfe2d14bf24d185eb7299be01e511582ba Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flac_picture.c')
0 files changed, 0 insertions, 0 deletions