aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pnm_parser.c
diff options
context:
space:
mode:
authorClément Bœsch <cboesch@gopro.com>2017-05-05 13:33:24 +0200
committerClément Bœsch <cboesch@gopro.com>2017-05-05 13:33:24 +0200
commit2eb8fcff0f998e20e5b3e67eb9de4d805eb71380 (patch)
treef3f7d2588cdeeb85937aedeb00b6c03fc1c33817 /libavcodec/pnm_parser.c
parent5786ee3eee7a88bf9faecc7246b35cfa64b31236 (diff)
parenta3c3a5eac20a51d402c332cdf5220fff40a7943f (diff)
downloadffmpeg-2eb8fcff0f998e20e5b3e67eb9de4d805eb71380.tar.gz
Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'
* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f': vaapi_encode: Support forcing IDR frames via AVFrame.pict_type This commit is a noop, see c667c0979cbc2e04d1d00964b82ac49746caa43c Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/pnm_parser.c')
0 files changed, 0 insertions, 0 deletions