aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/filtfmts.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-09 22:48:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-09 22:48:25 +0200
commitd52f874c7fa716f49bf35838d6bf0959016f48f6 (patch)
tree57dc56cd59a4b505deb9b9cad5a452fbcb2c0519 /libavfilter/filtfmts.c
parente932ae5940562ae0a183687053a5457a76fd1fa9 (diff)
parentb8604a976128ffbd316653cdec11ba487f1025bb (diff)
downloadffmpeg-d52f874c7fa716f49bf35838d6bf0959016f48f6.tar.gz
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb': oggparsecelt: do not set AVCodecContext.frame_size Conflicts: libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/filtfmts.c')
0 files changed, 0 insertions, 0 deletions