Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 19:46:35 +0000 (21:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 19:46:35 +0000 (21:46 +0200)
commit5864ce13d188260998bbf49a2a774fa9bd445c10
tree149cc5b73142b5a876068d33ec1c127c65e6f37f
parent8c51ea54897c2d8671b38efecc1422ad4ad344f9
parent50d1f4437be88a4b7e412e90d71153cae68017cc
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>
libavcodec/libx264.c
libavformat/isom.h
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mp3dec.c