OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13795db 12e25ed)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 12:07:25 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 12:07:25 +0000 (13:07 +0100)
commitcacbf64a76acb69b2efd773e8d7ab01bc957560d
tree80e9d70ed0a266a3540daa5707ff5b71ee2b475ftree | snapshot
parent13795dbb642cecf46e75fb6a78c830bf862c2310commit | diff
parent12e25ed284592b32c954d471e9b7b1e5a0dbf18dcommit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()

Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
libavcodec/aacdec.c diff1 | diff2 | blob | history
libavcodec/aacsbr.c diff1 | diff2 | blob | history
libavcodec/ac3dec.c diff1 | diff2 | blob | history
libavcodec/amrnbdec.c diff1 | diff2 | blob | history
libavcodec/amrwbdec.c diff1 | diff2 | blob | history
libavcodec/eac3dec.c diff1 | diff2 | blob | history
libavcodec/flashsv.c diff1 | diff2 | blob | history
libavcodec/h264.c diff1 | diff2 | blob | history
libavcodec/mimic.c diff1 | diff2 | blob | history
libavcodec/mpc8.c diff1 | diff2 | blob | history
libavcodec/rv10.c diff1 | diff2 | blob | history
libavcodec/smc.c diff1 | diff2 | blob | history
libavcodec/truemotion2.c diff1 | diff2 | blob | history
libavcodec/vp8.c diff1 | diff2 | blob | history
libavcodec/wmalosslessdec.c diff1 | diff2 | blob | history
libavcodec/wmaprodec.c diff1 | diff2 | blob | history
libavcodec/wmavoice.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help