Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Sep 2012 14:11:34 +0000 (16:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Sep 2012 14:11:34 +0000 (16:11 +0200)
commitabcaacf1acb4c7d7c2df5718fd56a714d4998305
treee1d7a138ddab9f9863d792719aa349a73f79f2fa
parentd3ef2da59df2bf65bea0ae7b519625c51c6f21dc
parent7a1a9dd56cb4cafad054bf6d65b21bb24d31c544
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pthread: make sure AVFrame.extended_data is set properly.
  libfdk-aac: reindent after last commit
  libfdk-aac: Limit to supported sample rates.
  cbrt_tablegen: Include libm.h
  oggparsetheora: make it more robust
  ogg: prevent NULL pointer deference in theora gptopts

Conflicts:
libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cbrt_tablegen.c
libavcodec/libfdk-aacenc.c
libavcodec/pthread.c
libavformat/oggparsetheora.c