ffmpeg/libavformat
Michael Niedermayer 82db8ee321 Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
  avconv: improve sample format negotiation for decoder request
  Opus encoder using libopus
  mpegts: Drop pointless casting of hex_dump_debug arguments
  avformat: const correctness for av_hex_dump / av_hex_dump_log
  wmadec: Adjust debug printf argument length modifier

Conflicts:
	Changelog
	ffmpeg.c
	libavcodec/libopusdec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 14:58:19 +02:00
..
4xm.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
a64.c
aacdec.c
ac3dec.c ac3dec: fix uninitialized var warning 2012-08-30 05:17:24 +02:00
act.c
adtsenc.c
adxdec.c
aea.c
aiff.h
aiffdec.c isom: fix redundant redeclaration of ff_mov_read_chan(). 2012-10-02 00:26:15 +02:00
aiffenc.c
allformats.c WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
amr.c
anm.c
apc.c
ape.c lavf/ape: Fix stream duration calculation 2012-08-23 15:51:51 +02:00
apetag.c
apetag.h
apetagenc.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
asfenc.c asfenc: avoid negative timestamps 2012-09-28 02:40:53 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
assenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
au.c lavf/au: check bits per coded sample. 2012-08-18 17:45:58 +02:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
avienc.c avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
avio.c avio: replace ETIMEDOUT by EIO 2012-09-08 02:28:20 +02:00
avio.h Merge remote-tracking branch 'qatar/master' 2012-09-28 05:11:19 +02:00
avio_internal.h
aviobuf.c avio: flush the internal buffer in avio_close() 2012-09-15 18:24:49 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
bit.c
bluray.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
bmv.c
c93.c
cache.c cache: Only include unistd.h if it exists 2012-09-07 19:29:58 +02:00
caf.c
caf.h
cafdec.c Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
concat.c
crcenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
crypto.c crypto: Remove a stray double space 2012-08-31 23:27:27 +02:00
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
dv.h
dvenc.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
dxa.c
eacdata.c
electronicarts.c
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
ffmenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
file.c file: set the return value type for lseek to off_t 2012-09-27 01:47:49 +02:00
filmstripdec.c filmstripdec: add new line to error message 2012-08-31 23:03:18 +02:00
filmstripenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
flacdec.c
flacenc.c
flacenc.h
flacenc_header.c
flic.c flic: use AV_LOG_ERROR for error message 2012-08-31 23:04:05 +02:00
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2012-09-11 15:24:22 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
framecrcenc.c
framehash.c
g723_1.c
g729dec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
gif.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
gopher.c
gsmdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
gxf.c
gxf.h
gxfenc.c gxfenc: assert that the to be written data has not been truncated. 2012-09-09 14:31:44 +02:00
h261dec.c
h263dec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
h264dec.c
hls.c hls: fix min DTS code, try #2 2012-08-21 01:52:55 +02:00
hlsproto.c
http.c Merge remote-tracking branch 'qatar/master' 2012-09-28 13:54:40 +02:00
http.h
httpauth.c
httpauth.h
icodec.c
icoenc.c Add ICO muxer 2012-08-14 16:54:25 +02:00
id3v1.c
id3v1.h
id3v2.c id3v2: strdup the genre name explicitly. 2012-09-17 15:48:20 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
ilbc.c
img2.c
img2dec.c img2dec: always close AVIOContexts 2012-09-12 14:31:09 +02:00
img2enc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
ingenientdec.c
internal.h lavf: factor ff_free_stream() out 2012-08-21 06:13:54 +02:00
ipmovie.c
isom.c
isom.h mov: add option to ignore edit lists. 2012-10-02 14:18:46 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libavformat.v libavformat.v: export ffurl_protocol_next 2012-09-13 16:21:25 +02:00
libmodplug.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libnut.c
librtmp.c
lmlm4.c
loasdec.c
lxfdec.c Support reading 16-channel lxf files. 2012-08-16 10:20:25 +02:00
m4vdec.c
matroska.c Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013' 2012-09-20 19:43:38 +02:00
matroska.h lavf/mkv: prefix video stereo arrays with ff_. 2012-09-16 02:58:40 +02:00
matroskadec.c Merge remote-tracking branch 'qatar/master' 2012-09-21 14:44:32 +02:00
matroskaenc.c Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013' 2012-09-20 19:43:38 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov.c mov: add option to ignore edit lists. 2012-10-02 14:18:46 +02:00
mov_chan.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
mov_chan.h mov_chan: Pass a separate AVIOContext for reading 2012-09-07 10:49:35 +03:00
movenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
movenc.h lavf/movenc: add faststart option. 2012-09-27 08:59:36 +02:00
movenchint.c
mp3dec.c mp3dec: fix seeking without xing TOC 2012-09-20 22:00:52 +02:00
mp3enc.c mp3enc: merge mp2/mp3_write_trailer 2012-09-16 14:37:50 +02:00
mpc.c mpc: fix seeking to the end 2012-08-27 05:23:42 +02:00
mpc8.c
mpeg.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpegts.c Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
mtv.c
mvi.c
mxf.c mxf: export ff_mxf_get_samples_per_frame to lavf 2012-09-21 16:20:38 +02:00
mxf.h mxf: export ff_mxf_get_samples_per_frame to lavf 2012-09-21 16:20:38 +02:00
mxfdec.c mxfdec: allow container_ul to override codec_ul if codec is A-law 2012-09-27 21:28:35 +02:00
mxfenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mxg.c
ncdec.c
network.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
network.h
nsvdec.c nsvdec: change 2 commented assert() to av_assert() 2012-09-18 05:08:32 +02:00
nullenc.c
nut.c nutenc: keep track of the written syncpoint count 2012-08-26 22:15:16 +02:00
nut.h nutenc: keep track of max_pts 2012-08-26 22:15:20 +02:00
nutdec.c nut: store and read the r_frame_rate 2012-10-02 01:09:12 +02:00
nutenc.c nutenc: choose for non audio streams a timebase with finer resolution. 2012-10-02 01:09:12 +02:00
nuv.c
oggdec.c Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8' 2012-09-25 16:00:09 +02:00
oggdec.h oggdec: add missing () for OGG_NOGRANULE_VALUE 2012-09-25 16:03:55 +02:00
oggenc.c Merge remote-tracking branch 'qatar/master' 2012-09-28 05:11:19 +02:00
oggparsecelt.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparsedirac.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseflac.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseogm.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseopus.c
oggparseskeleton.c Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8' 2012-09-25 16:00:09 +02:00
oggparsespeex.c ogg: check that the expected number of headers had been parsed 2012-09-24 22:35:29 +02:00
oggparsetheora.c oggparsetheora: print error when failing on unknown header 2012-09-25 17:32:11 +02:00
oggparsevorbis.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oma.c
oma.h
omadec.c
omaenc.c lavf: add missing new line to some error messages 2012-09-01 15:59:30 +02:00
options.c
options_table.h lavf: Add support offset timestamps on muxing. 2012-09-26 15:55:16 +02:00
os_support.c
os_support.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
paf.c
pcm.c
pcm.h
pcmdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
pcmenc.c
pmpdec.c
psxstr.c psxstr: more correct array type. 2012-09-01 23:45:32 +02:00
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 2012-08-21 06:14:29 +02:00
rdt.h
realtextdec.c
riff.c bitmap header lookup: add code comment 2012-09-23 02:12:34 +02:00
riff.h
rl2.c
rm.c
rm.h rmdec: pass mime type to ff_rm_read_mdpr_codecdata() 2012-08-21 06:14:29 +02:00
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
rmenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rtmp.h Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
rtmpcrypt.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
rtmpcrypt.h
rtmpdh.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtmpdh.h
rtmphttp.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
rtmppkt.c
rtmppkt.h
rtmpproto.c rtmpproto: reorder some expressions to fix compilation with clang without optimizations 2012-09-12 05:17:52 +02:00
rtp.c
rtp.h
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec.h Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec_g726.c
rtpdec_h263.c
rtpdec_h263_rfc2190.c
rtpdec_h264.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
rtpdec_ilbc.c
rtpdec_jpeg.c Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
rtpdec_latm.c
rtpdec_mpeg4.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c rtpdec_xiph: switch to av_assert() 2012-08-24 13:44:25 +02:00
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h263_rfc2190.c
rtpenc_h264.c
rtpenc_jpeg.c Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c rtpenc_xiph: switch to av_assert 2012-08-28 22:29:20 +02:00
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
sctp.c
sdp.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
seek-test.c
seek.c
seek.h
segafilm.c
segment.c lavf/segment: Use distinct IDs for list type ext & csv 2012-09-15 22:58:12 +02:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
smoothstreamingenc.c Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
smush.c smush: read subversion for version==1 too. 2012-09-09 02:36:57 +02:00
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
srtdec.c
srtenc.c matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 2012-08-31 20:22:49 -07:00
subtitles.c
subtitles.h
subviewerdec.c
swf.c Merge remote-tracking branch 'qatar/master' 2012-08-18 15:20:32 +02:00
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
swfenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
tcp.c
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
txd.c
udp.c udp: pick params from AVOptions also 2012-09-15 22:13:21 +02:00
url.h Add 'rw_timeout' into URLContext 2012-08-29 00:05:03 +02:00
urldecode.c
urldecode.h
utils.c Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d' 2012-10-02 14:58:19 +02:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2012-09-28 05:11:19 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c wav: Fix DTS detection 2012-09-23 01:22:16 +02:00
wc3movie.c
webvttdec.c WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
westwood_aud.c
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c wtvdec: Remove unused strings.h header 2012-09-07 18:24:50 +02:00
wtvenc.c
wv.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.c yuv4mpeg: fix potential alignment bug 2012-09-08 13:37:35 +02:00