RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
58257ea29e
ffmpeg/libavformat
History
Michael Niedermayer 58257ea29e Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  mp3enc: write a xing frame containing number of frames in the file
  lavf: update AVStream.nb_frames when muxing.
  ffmpeg: remove unused variables from InputStream.
  doc: update ffmpeg -ar and -ac documentation to reflect reality.
  ffmpeg: remove pointless if (nb_input_files)
  ffmpeg: merge input_files_ts_offset into input_files.
  ffmpeg: merge input_codecs into input_streams.
  ffmpeg: drop AV prefixes from struct names.
  ffmpeg: deprecate loop_input and loop_output options
  gif: add loop private option.
  img2: add loop private option.
  AVOptions: in av_opt_find() don't return named constants unless unit is specified.
  x11grab: replace undocumented nomouse hackery with a private option.
  dict: extend documentation.
  lls: whitespace cosmetics
  docs: Use proper markup for a literal command line option
  docs: Remove a remark that isn't relevant any longer
  docs: Explain how to regenerate import libraries with MSVC tools
  docs: Mention that libraries for MSVC can be built with a cross compiler
  docs: Remove old docs that mention setting up a build environment with lib.exe
  ...

Conflicts:
	doc/ffmpeg.texi
	doc/general.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/dnxhddata.c
	libavformat/mp3enc.c
	libavformat/utils.c
	libavutil/Makefile
	tests/copycooker.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-09 02:06:40 +02:00
..
4xm.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
a64.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
aacdec.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
ac3dec.c
adts.h
adtsenc.c Merge remote-tracking branch 'qatar/master' 2011-07-08 01:05:28 +02:00
aea.c
aiff.h
aiffdec.c replace remaining usage of deprecated av_metadata_set2() by av_dict_set() 2011-06-13 19:02:50 +02:00
aiffenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
allformats.c Initial caf muxer. 2011-05-15 03:25:57 +02:00
amr.c
anm.c
apc.c
ape.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
apetag.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
apetag.h
applehttp.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
applehttpproto.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
asf.c
asf.h
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
assenc.c
au.c
audiointerleave.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
avi.c
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
avienc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
avio_internal.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avio.c Simplify code and avoid compiler warning about incompatible types. 2011-06-01 20:29:27 +02:00
avio.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
aviobuf.c Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
bfi.c
bink.c Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
c93.c
caf.c Support decoding of amr_nb and gsm in caf. 2011-05-15 03:25:57 +02:00
caf.h Move channel chunk reading function to isom.c. 2011-04-28 10:45:32 +02:00
cafdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
cafenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
cavsvideodec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
cdg.c
concat.c
crcenc.c
crypto.c crypto: Use av_freep instead of av_free 2011-06-09 02:43:55 +02:00
cutils.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
daud.c
dfa.c
diracdec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
dnxhddec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
dsicin.c
dtsdec.c
dv.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
dv.h Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dvenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
dxa.c
eacdata.c Set channel layout for 4 and 5.1 channel cdata audio files 2011-04-25 12:13:51 +10:00
electronicarts.c
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
ffmenc.c Merge remote-tracking branch 'qatar/master' 2011-07-06 23:57:11 +02:00
ffmeta.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
ffmetadec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ffmetaenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
file.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
filmstripdec.c
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
flacenc.h
flic.c
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
framecrcenc.c
gif.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
gopher.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
gxf.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
gxf.h
gxfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
h261dec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
h263dec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
h264dec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
http.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
http.h
httpauth.c
httpauth.h
id3v1.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
id3v1.h
id3v2.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
id3v2.h
idcin.c
idroqdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
idroqenc.c
iff.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
img2.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
ingenientdec.c Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ipmovie.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
isom.c Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +02:00
isom.h Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c
libavformat.v
libnut.c
librtmp.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
lmlm4.c
lxfdec.c
m4vdec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
Makefile examples: move metadata-example.c to doc/examples 2011-07-08 09:40:30 +02:00
matroska.c matroska: improve declaration of video_stereo_* constant tables 2011-05-24 23:34:24 +02:00
matroska.h Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
matroskadec.c Merge remote-tracking branch 'qatar/master' 2011-07-02 03:24:32 +02:00
matroskaenc.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
md5enc.c
md5proto.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
metadata.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
metadata.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
microdvddec.c
microdvdenc.c
mm.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mmf.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
mms.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mms.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
mmsh.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mmst.c Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
mov.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
movenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
movenc.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
movenchint.c
mp3dec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mp3enc.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
mpc8.c
mpc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
mpeg.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mpegvideodec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c
mxf.h
mxfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mxfenc.c mxfenc: fix ignored drop flag in binary timecode representation. 2011-07-05 17:22:51 +02:00
mxg.c
ncdec.c
network.h Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
nsvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
nullenc.c
nut.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
nut.h
nutdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
nutenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
nuv.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
oggdec.c Merge remote-tracking branch 'qatar/master' 2011-07-05 02:26:17 +02:00
oggdec.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
oggenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
oggparsecelt.c Fix various unused variable warnings 2011-05-30 00:24:01 +02:00
oggparsedirac.c
oggparseflac.c
oggparseogm.c Remove unused variables 2011-06-02 20:06:00 +01:00
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
oma.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
os_support.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
os_support.h Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
pcm.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
pcm.h
pcmdec.c Merge remote-tracking branch 'qatar/master' 2011-05-26 03:28:22 +02:00
pcmenc.c
pmpdec.c
psxstr.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
pva.c
qcp.c
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rawdec.c Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2011-06-05 03:00:31 +02:00
rawenc.c
rawenc.h
rawvideodec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
rdt.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
rdt.h
riff.c Support fourcc YV24. 2011-07-06 10:05:08 +02:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
rmenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
rpl.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtp.c
rtp.h
rtpdec_amr.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_asf.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
rtpdec_formats.h
rtpdec_h263.c
rtpdec_h264.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_latm.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
rtpdec_mpeg4.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_qcelp.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_qdm2.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
rtpdec_qt.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_svq3.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_vp8.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_xiph.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtpdec.h Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c Make buffer size check consistent and avoid a possible overflow. 2011-06-15 20:21:33 +02:00
rtpenc_latm.c Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200' 2011-06-17 05:49:58 +02:00
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
rtpproto.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
sapenc.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
sauce.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
sauce.h
sdp.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
seek.h
segafilm.c
sierravmd.c
siff.c
smacker.c Remove unused variables 2011-06-02 20:06:00 +01:00
sol.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
sox.h
soxdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
soxenc.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
spdif.c
spdif.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
spdifdec.c
spdifenc.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
srtdec.c
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
swfenc.c Fix some passing argument from incompatible pointer type warnings. 2011-04-24 17:46:50 +02:00
tcp.c TCP: change default timeout to 5sec 2011-05-30 02:39:26 +02:00
thp.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
tiertexseq.c
timefilter.c
timefilter.h
tmv.c
tta.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
tty.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
txd.c
udp.c Merge remote-tracking branch 'qatar/master' 2011-07-01 05:35:26 +02:00
url.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
vorbiscomment.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
vqf.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
wav.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
wc3movie.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
westwood.c
wtv.c doxygen: Fix parameter names to match the function prototypes. 2011-07-03 18:30:02 +02:00
wtv.h WTV: Add ff_ prefix to the moved fields. 2011-05-01 21:13:18 +02:00
wtvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
wv.c Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
xa.c
xwma.c
yop.c
yuv4mpeg.c Remove unused variables 2011-06-02 20:06:00 +01:00