Changeset b97b4b58 in ffmpeg
- Timestamp:
-
May 10, 2011, 2:03:17 AM
(14 years ago)
- Author:
- Michael Niedermayer <michaelni@gmx.at>
- Branches:
- master
- Children:
- 7bea13f1
- Parents:
- 67d44149 (diff), a88ef93b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- git-author:
- Michael Niedermayer <michaelni@gmx.at> (05/10/11 02:01:29)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (05/10/11 02:03:17)
- Message:
-
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>
-
(No files)
-
