Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 May 2011 02:01:29 +0000 (04:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 May 2011 02:03:17 +0000 (04:03 +0200)
commitb97b4b58a6e1ac595002b3e3f3469161771c6003
tree8c2833931fb16084f95bf0adf8317e1fa28aca12
parent67d441499a042edcfb0f8a120e6196d10b1d13db
parenta88ef93b4abbea9f18c8750113dc9e99931f2f8a
Merge remote branch 'qatar/master'

* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
cmdutils.c
configure
ffmpeg.c
libavcodec/Makefile
libavcodec/bfin/mathops.h
libavcodec/mpegaudio.h
libavcodec/mpegaudio_tablegen.h
libavcodec/mpegaudiodec.c
libavcodec/mpegaudioenc.c
libavformat/mpegtsenc.c
libavformat/rtpproto.c
libavformat/udp.c
tests/codec-regression.sh
tests/lavfi-regression.sh