summaryrefslogtreecommitdiffstats
path: root/ffmpeg_filter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-18 15:58:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-18 15:58:55 +0200
commit709ab39cb9a4887a08ed0d8fc25c2ddc79731f85 (patch)
tree94e858b94de9fd21b4d32504fa8466717306d3cd /ffmpeg_filter.c
parent1a5871d1bec6863dfee05c9cc8b97e2307530ce6 (diff)
parent15ec053c4c0b198a2e93eb8e60c8f41e091e0c40 (diff)
downloadffmpeg-streaming-709ab39cb9a4887a08ed0d8fc25c2ddc79731f85.zip
ffmpeg-streaming-709ab39cb9a4887a08ed0d8fc25c2ddc79731f85.tar.gz
Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'
* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40': lavc: make border_masking into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud