aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-01 14:35:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-01 14:35:53 +0200
commitd09793576760c3f6894007184875a158b7be2347 (patch)
tree853ca99459c8c753293cb733f90932f61edddfdd /libpostproc
parent955b31a7513e924cce36e484dc098581290af9b6 (diff)
parent41776ba9c0ebbb71394cefdf7dd1b243e6c852d5 (diff)
downloadffmpeg-d09793576760c3f6894007184875a158b7be2347.tar.gz
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5': avconv: do not use the stream codec context for decoding Conflicts: ffmpeg.c ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions