git.osdn.net Git - android-x86/external-ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 14 Mar 2013 11:30:19 +0000 (12:30 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 14 Mar 2013 11:30:19 +0000 (12:30 +0100)
commit	fa92ee821bba1d3c2a497ed22e41927b552856f8
tree	26bb0752049f1abb82e03e127f175ff2c0b78387	tree \| snapshot
parent	905e7eb41389e4394e9c6e459b7d1a99dc30b075	commit \| diff
parent	63d744e2be39466e3a734c2987cd713e0bac101e	commit \| diff

Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'

* commit '63d744e2be39466e3a734c2987cd713e0bac101e':
av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
libavcodec/aacdec.c
libavcodec/tta.c
libavformat/mpegts.c

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

17 files changed:

libavcodec/aac_adtstoasc_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aacdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aacsbr.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amrnbdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amrwbdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/flacdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libopencore-amr.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdec_lgpl.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp6.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmalosslessdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggparseskeleton.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifdec.c	diff1 \|	diff2 \|	blob \| history

external/ffmpeg

About OSDN

Find Software

Develop Software

Help

libavcodec/aac_adtstoasc_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aacdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aacsbr.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amrnbdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amrwbdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/flacdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libopencore-amr.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdec_lgpl.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp6.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmalosslessdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggparseskeleton.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifdec.c	diff1 \|	diff2 \|	blob \| history