Michael Niedermayer e18d9d90f1 Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83' ... * commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83': mpeg: Suppress a compiler warning on callback type Conflicts: libavformat/mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-08-10 02:20:54 +02:00
..
4xm.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
a64.c
aacdec.c	Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'	2014-07-29 21:12:07 +02:00
ac3dec.c
act.c
adp.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
adtsenc.c	avformat/adtsenc: Optionally enable ID3 in ADTS.	2014-07-22 02:11:25 +02:00
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
aiffenc.c
allformats.c	Autodetect jpeg-ls files.	2014-08-08 22:43:15 +02:00
amr.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
anm.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
apc.c
ape.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
apetag.c
apetag.h
aqtitledec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
asfenc.c
assdec.c
assenc.c
ast.c
ast.h
astdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
astenc.c
au.c
audiointerleave.c	Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'	2014-07-17 14:20:10 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h	Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'	2014-08-10 02:01:34 +02:00
avformatres.rc
avi.h
avidec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
avienc.c
avio_internal.h	Add int64_t probesize2 instead of int probesize to AVFormatContext.	2014-07-30 11:09:25 +02:00
avio.c	Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'	2014-07-27 02:09:41 +02:00
avio.h	lavf/avio: do not include bprint.h.	2014-08-09 15:51:04 +02:00
aviobuf.c	lavf/avio: rename url_feof() to avio_feof()	2014-08-08 00:48:22 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
bfi.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
bink.c
bintext.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
bit.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
bluray.c
bmv.c
boadec.c
brstm.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
c93.c
cache.c
caf.c
caf.h
cafdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
cinedec.c
concat.c
concatdec.c
crcenc.c
crypto.c
cutils.c
data_uri.c
dauddec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
daudenc.c
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
dtsdec.c	avformat/dtsdec: check more of the dca headers in dts_probe()	2014-08-06 22:28:46 +02:00
dtshddec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
dump.c	Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4'	2014-07-29 00:41:00 +02:00
dv.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
dv.h
dvenc.c	avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps	2014-07-19 20:48:22 +02:00
dxa.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
eacdata.c
electronicarts.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
epafdec.c
ffm.h
ffmdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
ffmenc.c
ffmeta.h
ffmetadec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
ffmetaenc.c
file_open.c
file.c
filmstripdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
filmstripenc.c
flac_picture.c
flac_picture.h
flacdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
flvenc.c
format.c	Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'	2014-08-10 01:36:21 +02:00
framecrcenc.c
framehash.c
frmdec.c
ftp.c
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
golomb_tab.c
gopher.c
gsmdec.c
gxf.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hdsenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
hevc.c
hevc.h
hevcdec.c
hls.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
hlsenc.c	avformat/hlsenc: add some empty lines to make the code easier to read	2014-07-31 00:33:49 +02:00
hlsproto.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
hnm.c
http.c	Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'	2014-08-04 03:44:11 +02:00
http.h	Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'	2014-07-22 22:02:48 +02:00
httpauth.c
httpauth.h
icecast.c	Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'	2014-08-04 14:14:13 +02:00
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c
idcin.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
idroqdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
idroqenc.c
iff.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
ilbc.c
img2_alias_pix.c
img2_brender_pix.c
img2.c
img2.h
img2dec.c	Autodetect jpeg-ls files.	2014-08-08 22:43:15 +02:00
img2enc.c
ingenientdec.c
internal.h	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
ipmovie.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
jacosubenc.c
jvdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
latmenc.c
libavformat.v	lavf/avio: rename url_feof() to avio_feof()	2014-08-08 00:48:22 +02:00
libgme.c
libmodplug.c
libnut.c
libquvi.c
librtmp.c
libsmbclient.c
libssh.c
lmlm4.c
loasdec.c
log2_tab.c
lrc.c
lrc.h
lrcdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
lrcenc.c
lvfdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
lxfdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
m4vdec.c
Makefile	Autodetect jpeg-ls files.	2014-08-08 22:43:15 +02:00
matroska.c
matroska.h
matroskadec.c	avformat/matroskadec: Check avpriv_new_chapter() for failure	2014-08-08 21:16:30 +02:00
matroskaenc.c	avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation	2014-08-09 05:05:09 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
microdvddec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mm.c
mmf.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c	avformat/mov: Support reading Avid's metadata for DNXHD codec.	2014-08-08 18:39:04 +02:00
movenc.c	avformat/movenc: write reel_name metadata to tmcd atom	2014-08-09 03:08:25 +02:00
movenc.h	Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'	2014-08-07 02:42:15 +02:00
movenchint.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
mp3dec.c	Ignore xing number of frames if the file is larger than indicated.	2014-07-24 15:34:36 +02:00
mp3enc.c
mpc8.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mpc.c
mpeg.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mpeg.h
mpegenc.c	Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'	2014-08-10 02:20:54 +02:00
mpegts.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mpegts.h	lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()	2014-08-07 04:28:11 +02:00
mpegtsenc.c	mpegts: Use av_free() to free memory allocated by av_strdup()	2014-08-08 03:12:57 -07:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mpsubdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
msnwc_tcp.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mtv.c
mux.c	avformat/mux: flush after header writing, like after packets	2014-08-03 18:10:04 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h
mxfdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
mxfenc.c
mxg.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
ncdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
network.c
network.h
nistspheredec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
noproxy-test.c
nsvdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
nullenc.c
nut.c
nut.h
nutdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
nutenc.c
nuv.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
oggdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oggparsevp8.c
oma.c
oma.h
omadec.c
omaenc.c
options_table.h	Add int64_t probesize2 instead of int probesize to AVFormatContext.	2014-07-30 11:09:25 +02:00
options.c
os_support.c
os_support.h
paf.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
pmpdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
psxstr.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
pva.c
pvfdec.c
qcp.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
qtpalette.h
r3d.c
rawdec.c
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
redspark.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
replaygain.c
replaygain.h
riff.c
riff.h
riffdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
riffenc.c
rl2.c
rm.c
rm.h
rmdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
rmenc.c
rmsipr.c
rmsipr.h
rpl.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
rsd.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c
rtmppkt.h
rtmpproto.c
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c
rtpdec_ilbc.c
rtpdec_jpeg.c	Parse dri when receiving jpg via rtp.	2014-07-18 23:11:11 +02:00
rtpdec_latm.c
rtpdec_mpeg4.c
rtpdec_mpeg12.c
rtpdec_mpegts.c	lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()	2014-08-07 04:28:11 +02:00
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c
rtpdec.c
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c
rtpproto.h
rtsp.c	lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()	2014-08-07 04:28:11 +02:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
samidec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
sapdec.c
sapenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
sdr2.c
seek-test.c
seek.c	avformat/seek: use av_malloc_array()	2014-07-19 19:44:56 +02:00
seek.h
segafilm.c
segment.c	avformat/segment: re-interleave packets if needed	2014-07-24 23:22:33 +02:00
sierravmd.c
siff.c
smacker.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
smjpeg.c
smjpeg.h
smjpegdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
smjpegenc.c
smoothstreamingenc.c	avformat/mux: support re-interleaving packets in ff_write_chained()	2014-07-24 22:39:22 +02:00
smush.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
sol.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
spdifenc.c
srtdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
srtenc.c
srtp.c
srtp.h
srtpproto.c
subfile.c
subtitles.c
subtitles.h
subviewer1dec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
subviewerdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
swf.c
swf.h
swfdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
swfenc.c
takdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
tcp.c
tedcaptionsdec.c
tee.c	avformat/tee: flip assigment direction	2014-08-03 03:18:52 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
tta.c
tty.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
txd.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
udp.c
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h	Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'	2014-07-27 02:09:41 +02:00
urldecode.c
urldecode.h
utils.c	avcodec/raw: add avpriv_get_raw_pix_fmt_tags()	2014-08-07 12:52:38 +02:00
vc1test.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
vc1testenc.c
version.h	Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'	2014-08-10 02:01:34 +02:00
vivo.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
vqf.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
w64.c
w64.h
wavdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
wavenc.c
wc3movie.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
webmdashenc.c
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv_common.c
wtv.h
wtvdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
wtvenc.c
wv.c
wv.h
wvdec.c	replace calls to url_feof() with avio_feof()	2014-08-08 00:48:38 +02:00
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.h
yuv4mpegdec.c
yuv4mpegenc.c