aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/pmpdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-18 20:35:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-18 20:45:18 +0100
commit77c133f7ac526a32fc99d4abc8313984fcfd1a82 (patch)
tree2a186e38d25dca149f0f268aac76d725416c7639 /libavformat/pmpdec.c
parent00acf38379d333d3d20de7b70390eeae0f323512 (diff)
parentd617e77cecc5b363ef1860955b548f4ac007add6 (diff)
downloadffmpeg-77c133f7ac526a32fc99d4abc8313984fcfd1a82.tar.gz
Merge commit 'd617e77cecc5b363ef1860955b548f4ac007add6'
* commit 'd617e77cecc5b363ef1860955b548f4ac007add6': libx265: Add crf private option See: 8b96e8dd28c83448c9b4af81b834deb9b525be80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pmpdec.c')
0 files changed, 0 insertions, 0 deletions