aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-13 01:39:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-13 02:06:44 +0100
commit4e04e1b81e4e31b7a11b3b5033ac97d2da3b866d (patch)
treec12bd6d0b08e93cecc67993391c0ff0c6caed991 /libavformat/matroskadec.c
parentf51a0721604deb9aea230522e618b2c4769cad77 (diff)
parent3e23badd83edc021e8a830db109a08c5553988b0 (diff)
downloadffmpeg-4e04e1b81e4e31b7a11b3b5033ac97d2da3b866d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: swscale: convert yuv2yuvX() to using named arguments. swscale: rename "dstw" to "w" to prevent name collisions. swscale: use named registers in yuv2yuv1_plane() place. lavf: fix aspect ratio mismatch message. avconv: set AVFormatContext.duration from '-t' cljr: implement encode2. cljr: set the properties of the coded_frame, not input frame. dnxhdenc: switch to encode2. bmpenc: switch to encode2(). Conflicts: libavcodec/bmpenc.c libavcodec/cljr.c libavformat/utils.c tests/ref/vsynth1/cljr tests/ref/vsynth2/cljr Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
0 files changed, 0 insertions, 0 deletions