1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavformat
Michael Niedermayer 13795dbb64 Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
  avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
  rsodec: Use avpriv_report_missing_feature() where appropriate

Conflicts:
	libavcodec/anm.c
	libavcodec/mlpdec.c
	libavcodec/pictordec.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:52:12 +01:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c lavf/aiffenc: ID3 tags support 2013-01-22 20:27:05 +01:00
allformats.c Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201' 2013-03-13 12:21:43 +01:00
amr.c
anm.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
apc.c
ape.c
apetag.c
apetag.h
apetagenc.c
aqtitledec.c
asf.c Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761' 2013-02-10 12:39:17 +01:00
asf.h Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761' 2013-02-10 12:39:17 +01:00
asfcrypt.c Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 2013-02-06 14:25:28 +01:00
asfcrypt.h
asfdec.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
asfenc.c Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 2013-02-06 14:25:28 +01:00
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292' 2013-03-13 12:37:03 +01:00
avi.h
avidec.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
avienc.c
avio_internal.h
avio.c lavf/avio: check for : in filenames for protocols. 2013-02-28 19:30:56 +01:00
avio.h
aviobuf.c
avisynth.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
avlanguage.c
avlanguage.h
avr.c
avs.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
bethsoftvid.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
bfi.c
bink.c Merge remote-tracking branch 'qatar/master' 2013-02-01 14:34:18 +01:00
bintext.c
bit.c
bluray.c
bmv.c
brstm.c
c93.c
cache.c
caf.c
caf.h
cafdec.c cafdec: fix overflow checking in read_header() 2013-01-20 21:30:34 +01:00
cafenc.c cafenc: do not leak caf->pkt_sizes 2013-02-22 13:52:43 +00:00
cavsvideodec.c
cdg.c
cdxl.c
concat.c
concatdec.c lavf/concat: compute duration if possible. 2013-03-05 16:44:51 +01:00
crcenc.c
crypto.c
cutils.c
data_uri.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dtshddec.c
dv.c
dv.h
dvenc.c dvenc: dont fail hard if the timecode is invalid 2013-02-05 22:57:35 +01:00
dxa.c
eacdata.c eacdata: do not set sample_fmt 2013-01-24 15:02:44 +00:00
electronicarts.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
epafdec.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
filmstripenc.c
flacdec.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c flic: do not set sample_fmt 2013-01-24 15:02:44 +00:00
flv.h
flvdec.c Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9' 2013-03-02 11:41:31 +01:00
flvenc.c
framecrcenc.c framecrcenc: print all side data elements, not just the first 2013-02-06 18:17:27 +01:00
framehash.c
frmdec.c frmdec: do not abuse ff_codec_get_id() 2013-01-12 14:39:13 +00:00
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c lavf/gifdec: cosmetics: remove extra whitespace 2013-01-26 09:28:57 +00:00
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hls.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
hlsenc.c lavf/hlsenc: append last incomplete segment when closing the output 2013-01-21 19:21:21 +01:00
hlsproto.c Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201' 2013-03-13 12:21:43 +01:00
http.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
http.h
httpauth.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
httpauth.h
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
id3v2.h Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
id3v2enc.c
idcin.c Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' 2013-03-12 15:44:15 +01:00
idroqdec.c
idroqenc.c
iff.c iff: fix integer overflow 2013-03-05 01:39:50 +01:00
ilbc.c
img2.c
img2dec.c lavf/img2dec: fix option help fields 2013-01-25 00:04:22 +01:00
img2enc.c lavf/img2enc: extend current options documentation 2013-01-25 00:04:23 +01:00
ingenientdec.c
internal.h Merge remote-tracking branch 'qatar/master' 2013-02-28 13:13:04 +01:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
isom.h mov: prevent double free if the caller replaces the io context. 2013-01-22 05:15:47 +01:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c latmenc: Check for LOAS sync word 2013-01-17 04:55:14 +01:00
libavformat.v dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway. 2013-02-15 00:08:12 +01:00
libmodplug.c
libnut.c
librtmp.c
lmlm4.c
loasdec.c Require at least three frames to autodetect loas. 2013-02-02 22:36:25 +01:00
log2_tab.c
lvfdec.c
lxfdec.c
m4vdec.c
Makefile buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
matroska.c matroska: fix missing , 2013-02-21 22:24:26 +01:00
matroska.h Adding AlphaMode element to Matroska Parser 2013-02-14 21:34:47 +01:00
matroskadec.c matroskadec: request a read buffer for the wav header 2013-03-12 18:58:06 +01:00
matroskaenc.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c lavf/microdvd: fix muxing. 2013-02-21 00:59:32 +01:00
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
movenc.c movenc: Do not flag secondary audio and subtitle tracks as enabled. 2013-03-03 12:09:38 +01:00
movenc.h movenc: Do not flag secondary audio and subtitle tracks as enabled. 2013-03-03 12:09:38 +01:00
movenchint.c
mp3dec.c mp3dec: Fix VBR bit rate parsing 2013-03-08 07:32:11 +01:00
mp3enc.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
mpc8.c mpc8: check stream count before accessing stream 1. 2013-01-24 02:51:51 +01:00
mpc.c
mpeg.c mpeg12demux: Fallback to startcode for stream type identification. 2013-01-24 17:10:23 +01:00
mpeg.h
mpegenc.c
mpegts.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
mux.c Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292' 2013-03-13 12:37:03 +01:00
mvdec.c mvdec: check var_read_string() return value 2013-01-27 02:15:02 +01:00
mvi.c Fix division by 0 due to audio frame size 2013-02-10 18:15:33 +01:00
mxf.c
mxf.h
mxfdec.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
mxfenc.c
mxg.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
ncdec.c
network.c
network.h
nistspheredec.c
noproxy-test.c Merge remote-tracking branch 'qatar/master' 2013-02-28 13:13:04 +01:00
nsvdec.c
nullenc.c
nut.c Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df' 2013-01-15 14:57:57 +01:00
nut.h
nutdec.c nutdec: more specific return codes for decode_syncpoint() 2013-03-04 16:51:21 +01:00
nutenc.c nutenc: only write an index if there are syncpoints 2013-02-18 20:51:54 +01:00
nuv.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
oggdec.c oggdec: chained oggs have timestamp discontinuities 2013-02-27 03:46:12 +01:00
oggdec.h oggdec: resync from the last page. 2013-01-15 20:19:28 +01:00
oggenc.c oggenc: fix "oggstream may be used uninitialized in this function" warning 2013-01-29 15:57:42 +01:00
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e' 2013-03-14 12:30:19 +01:00
oggparsespeex.c
oggparsetheora.c oggparsetheora: fix comment header parsing 2013-01-14 20:47:27 +02:00
oggparsevorbis.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
oma.c
oma.h
omadec.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
omaenc.c
options_table.h lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions 2013-02-07 21:54:41 +01:00
options.c
os_support.c avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well 2013-03-12 20:06:31 +01:00
os_support.h avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well 2013-03-12 20:06:31 +01:00
paf.c
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c
pmpdec.c pmpdec: make i unsigned, avoid undefined behavior of i++ 2013-02-25 18:36:21 +01:00
psxstr.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
rawdec.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c lavf/rawvideodec: fix/extend option descriptions 2013-02-09 14:57:10 +01:00
rdt.c
rdt.h
realtextdec.c
riff.c ff_end_tag: assert that the start is aligned. 2013-02-08 12:51:52 +01:00
riff.h dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway. 2013-02-15 00:08:12 +01:00
rl2.c
rm.c
rm.h
rmdec.c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
rmenc.c
rmsipr.c
rmsipr.h
rpl.c
rso.c
rso.h
rsodec.c Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605' 2013-03-14 12:52:12 +01:00
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
rtmppkt.c rtmp: fix buffer overflows in ff_amf_tag_contents() 2013-01-23 13:51:28 +02:00
rtmppkt.h
rtmpproto.c rtmpproto: increase APP_MAX_LENGTH 2013-02-23 17:24:15 +01:00
rtp.c Merge remote-tracking branch 'qatar/master' 2013-02-01 14:34:18 +01:00
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec_g726.c
rtpdec_h263_rfc2190.c rtpdec: Move setting the parsing flags to the actual depacketizers 2013-01-20 18:20:42 +02:00
rtpdec_h263.c Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec_h264.c Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec_ilbc.c
rtpdec_jpeg.c
rtpdec_latm.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
rtpdec_mpeg4.c Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec_mpeg12.c Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec_mpegts.c Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c' 2013-01-21 13:52:42 +01:00
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
rtpdec_svq3.c
rtpdec_vp8.c Merge remote-tracking branch 'qatar/master' 2013-03-03 11:40:37 +01:00
rtpdec_xiph.c Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c' 2013-01-21 14:02:01 +01:00
rtpdec.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
rtpdec.h Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c' 2013-01-21 13:52:42 +01:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5' 2013-01-24 14:18:30 +01:00
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c rtpenc: fix overflow checking in avc_mp4_find_startcode() 2013-01-23 13:51:29 +02:00
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c rtpenc: do not use random values for seq when bitexact is requested. 2013-01-22 14:40:18 +01:00
rtpenc.h Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721' 2013-01-22 14:27:48 +01:00
rtpproto.c
rtsp.c Merge commit '2326558d5277ec87ba6d607a01ec6acfc51c694c' 2013-01-21 13:52:42 +01:00
rtsp.h Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05' 2013-01-15 16:05:34 +01:00
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c Merge commit '094a7405e5d8463d7d167d893e04934ec1a84ecd' 2013-01-15 16:12:24 +01:00
seek-test.c
seek.c
seek.h
segafilm.c
segment.c lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
smjpegenc.c
smoothstreamingenc.c
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
spdifenc.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
srtdec.c lavf/srtdec: do not try to queue empty subtitle chunks. 2013-01-27 20:26:35 +09:00
srtenc.c
srtp.c Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382' 2013-01-21 15:18:57 +01:00
srtp.h Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610' 2013-01-21 15:00:45 +01:00
srtpproto.c Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05' 2013-01-15 16:05:34 +01:00
subtitles.c Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 2013-03-08 19:12:03 +01:00
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c lavf/swfdec: remove 8-bit audio FIXME. 2013-02-21 00:59:31 +01:00
swfenc.c Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size" 2013-02-17 19:56:09 +01:00
takdec.c
tcp.c avformat/avdevice: add missing time.h includes 2013-03-12 15:28:22 +01:00
tedcaptionsdec.c lavf: add AV_ to two remaining CODEC_ID_*. 2013-03-12 16:21:22 +01:00
tee.c lavf: add tee pseudo-muxer. 2013-02-09 20:50:11 +01:00
thp.c
tiertexseq.c
tls.c Merge remote-tracking branch 'qatar/master' 2013-02-28 13:13:04 +01:00
tmv.c
tta.c
tty.c Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44' 2013-03-12 15:57:28 +01:00
txd.c
udp.c avformat/avdevice: add missing time.h includes 2013-03-12 15:28:22 +01:00
url-test.c
url.h
urldecode.c Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
urldecode.h
utils.c Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292' 2013-03-13 12:37:03 +01:00
vc1test.c
vc1testenc.c
version.h Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530' 2013-03-13 12:55:00 +01:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c
wavenc.c WAV muxer: reindent 2013-02-13 17:36:55 +00:00
wc3movie.c
webvttdec.c
westwood_aud.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c wtvdec: fix integer overflow 2013-01-20 20:59:30 +01:00
wtvenc.c
wv.c
wvenc.c
xa.c
xmv.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
xwma.c Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e' 2013-03-14 12:41:34 +01:00
yop.c
yuv4mpeg.c Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order. 2013-02-02 12:32:04 +01:00