aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/faandct.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-30 20:59:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-30 21:11:49 +0200
commit2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016 (patch)
treecca664f41bca8250f1d782a706c92a3c63effd47 /libavcodec/faandct.c
parent185e76976e8291d42f82972d0b7e103ef4b2d8cd (diff)
parent3e3056f2a020dd77efdf379dbd4c06a65b4a499a (diff)
downloadffmpeg-2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016.tar.gz
Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'
* commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a': h264: Allow stream and container cropping at the same time Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/faandct.c')
0 files changed, 0 insertions, 0 deletions