• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · b97b4b58
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b97b4b58
Makefile 40.8 KB