aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/msvideo1enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-20 21:46:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-20 21:46:35 +0200
commit5864ce13d188260998bbf49a2a774fa9bd445c10 (patch)
tree149cc5b73142b5a876068d33ec1c127c65e6f37f /libavcodec/msvideo1enc.c
parent8c51ea54897c2d8671b38efecc1422ad4ad344f9 (diff)
parent50d1f4437be88a4b7e412e90d71153cae68017cc (diff)
downloadffmpeg-5864ce13d188260998bbf49a2a774fa9bd445c10.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mp3dec: read Xing frame TOC index mp3dec: use named constants for Xing header flags libx264: add support for nal-hrd, required for Blu-ray streams. mov: support random access point grouping matroskadec: properly support BlockDuration Conflicts: libavcodec/libx264.c libavformat/isom.h libavformat/matroskadec.c libavformat/mov.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msvideo1enc.c')
0 files changed, 0 insertions, 0 deletions