git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 6 Apr 2012 20:52:01 +0000 (22:52 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 6 Apr 2012 20:52:01 +0000 (22:52 +0200)
commit	2e0c360abd74b94991aa9a271cadc72aae1471c2
tree	cbea40b59f334f8f7447a79b6fbdf514f0dd2e0c	tree \| snapshot
parent	bd128e9bff8aaec97ce7dcd414717c214536c7d9	commit \| diff
parent	20234a4bd7e187ae31f9a66b5c40e98666bc30e4	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Align muxer/demuxer declarations
  mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
  avcodec: remove avcodec_guess_channel_layout()
  avutil: Add av_get_default_channel_layout()

Conflicts:
doc/APIchanges
libavcodec/mpeg12.c
libavformat/cdg.c
libavformat/matroskaenc.c
libavformat/mpegts.c
libavformat/nuv.c
libavformat/wav.c
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

67 files changed:

libavcodec/ac3enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.c	diff1 \|	diff2 \|	blob \| history
libavformat/a64.c	diff1 \|	diff2 \|	blob \| history
libavformat/aacdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ac3dec.c	diff1 \|	diff2 \|	blob \| history
libavformat/aea.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/amr.c	diff1 \|	diff2 \|	blob \| history
libavformat/ape.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/au.c	diff1 \|	diff2 \|	blob \| history
libavformat/avienc.c	diff1 \|	diff2 \|	blob \| history
libavformat/cafdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/cdg.c	diff1 \|	diff2 \|	blob \| history
libavformat/daud.c	diff1 \|	diff2 \|	blob \| history
libavformat/dfa.c	diff1 \|	diff2 \|	blob \| history
libavformat/dtsdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/dv.c	diff1 \|	diff2 \|	blob \| history
libavformat/filmstripdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/ingenientdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/iv8.c	diff1 \|	diff2 \|	blob \| history
libavformat/ivfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ivfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/libnut.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskaenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mp3dec.c	diff1 \|	diff2 \|	blob \| history
libavformat/mp3enc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpeg.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegtsenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mvi.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxg.c	diff1 \|	diff2 \|	blob \| history
libavformat/ncdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nullenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/nuv.c	diff1 \|	diff2 \|	blob \| history
libavformat/pva.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawvideodec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/sapdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/sapenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/siff.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/tmv.c	diff1 \|	diff2 \|	blob \| history
libavformat/tta.c	diff1 \|	diff2 \|	blob \| history
libavformat/vc1test.c	diff1 \|	diff2 \|	blob \| history
libavformat/vocdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/vocenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/wav.c	diff1 \|	diff2 \|	blob \| history
libavformat/yop.c	diff1 \|	diff2 \|	blob \| history
libavformat/yuv4mpeg.c	diff1 \|	diff2 \|	blob \| history
libavutil/avutil.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

libavcodec/ac3enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.c	diff1 \|	diff2 \|	blob \| history
libavformat/a64.c	diff1 \|	diff2 \|	blob \| history
libavformat/aacdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ac3dec.c	diff1 \|	diff2 \|	blob \| history
libavformat/aea.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/amr.c	diff1 \|	diff2 \|	blob \| history
libavformat/ape.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/au.c	diff1 \|	diff2 \|	blob \| history
libavformat/avienc.c	diff1 \|	diff2 \|	blob \| history
libavformat/cafdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/cdg.c	diff1 \|	diff2 \|	blob \| history
libavformat/daud.c	diff1 \|	diff2 \|	blob \| history
libavformat/dfa.c	diff1 \|	diff2 \|	blob \| history
libavformat/dtsdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/dv.c	diff1 \|	diff2 \|	blob \| history
libavformat/filmstripdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/ingenientdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/iv8.c	diff1 \|	diff2 \|	blob \| history
libavformat/ivfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ivfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/libnut.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskaenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mp3dec.c	diff1 \|	diff2 \|	blob \| history
libavformat/mp3enc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpeg.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegtsenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mvi.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxg.c	diff1 \|	diff2 \|	blob \| history
libavformat/ncdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nullenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/nuv.c	diff1 \|	diff2 \|	blob \| history
libavformat/pva.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawvideodec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtpenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/sapdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/sapenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/siff.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/tmv.c	diff1 \|	diff2 \|	blob \| history
libavformat/tta.c	diff1 \|	diff2 \|	blob \| history
libavformat/vc1test.c	diff1 \|	diff2 \|	blob \| history
libavformat/vocdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/vocenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/wav.c	diff1 \|	diff2 \|	blob \| history
libavformat/yop.c	diff1 \|	diff2 \|	blob \| history
libavformat/yuv4mpeg.c	diff1 \|	diff2 \|	blob \| history
libavutil/avutil.h	diff1 \|	diff2 \|	blob \| history