« Previous | Next » 

Revision b97b4b58

IDb97b4b58a6e1ac595002b3e3f3469161771c6003
Parent 67d44149, a88ef93b
Child 7bea13f1

Added by Michael Niedermayer over 9 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted