RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
86909dd5f7
ffmpeg/libavformat
History
Michael Niedermayer 45fb647495 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bitstream: Properly promote av_reverse values before shifting.
  libavutil/swscale: YUV444P10/YUV444P9 support.
  H.264: Fix high bit depth explicit biweight
  h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
  Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
  Update copyright year for ac3enc_opts_template.c.
  adts: Adjust frame size mask to follow the specification.
  movenc: Add RTP muxer/hinter options
  movenc: Pass the RTP AVFormatContext to the SDP generation
  rtspenc: Add RTP muxer options
  rtspenc: Add an AVClass for setting muxer specific options
  rtpenc_chain: Pass the rtpflags options through to the chained muxer
  rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
  sdp: Reindent after the previous commit
  rtpenc: MP4A-LATM payload support
  avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
  sdp: Allow passing an AVFormatContext to the SDP generation
  mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
  mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
  swscale: split YUYV output out of yuv2packed[12X]_c().

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/h264dsp_template.c
	libavcodec/mpeg12.c
	libavformat/aacdec.c
	libavformat/avidec.c
	libavformat/internal.h
	libavformat/movenc.c
	libavformat/rtpenc.c
	libavformat/rtpenc_latm.c
	libavformat/sdp.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/pixfmt.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-11 03:51:36 +02:00
..
4xm.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
a64.c
aacdec.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
aiffenc.c Write channel_layout for multichannel aif files. 2011-05-17 01:56:01 +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-06-09 04:47:19 +02:00
applehttpproto.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
asf.c
asf.h Merge remote branch 'qatar/master' 2011-04-17 23:43:54 +02:00
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
avi.c
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +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-05-22 04:53:19 +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
bfi.c
bink.c
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-06-09 04:47:19 +02:00
cafenc.c Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +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 Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dv.h Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dvenc.c
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 Use av_set_pts_info to set time_base. 2011-04-16 17:51:00 +02:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
ffmenc.c
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-06-09 04:47:19 +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 Replace mplayerhq.hu URLs by libav.org. 2011-04-18 18:23:16 +02:00
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
framecrcenc.c
gif.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
gopher.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
gxf.c
gxf.h
gxfenc.c replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +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 Merge remote branch 'qatar/master' 2011-04-17 23:43:54 +02:00
idroqdec.c
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-06-07 03:37:57 +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-06-11 03:51:36 +02:00
ipmovie.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
isom.c Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +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 branch 'qatar/master' 2011-04-20 04:48:23 +02:00
lmlm4.c
lxfdec.c
m4vdec.c Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
Makefile rtpenc: MP4A-LATM payload support 2011-06-10 10:49:20 +03: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 matroskadec: set timestamps for RealAudio packets. 2011-06-09 22:53:17 +02:00
matroskaenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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
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-06-08 05:25:28 +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-06-11 03:51:36 +02:00
movenc.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +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-06-09 04:47:19 +02:00
mp3enc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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-06-11 03:51:36 +02:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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-06-02 05:12:10 +02:00
mxfenc.c 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +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-06-11 03:51:36 +02:00
nullenc.c
nut.c nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE 2011-04-28 07:25:28 +02:00
nut.h
nutdec.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
nutenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
nuv.c
oggdec.c oggdec: fix Ticket185 2011-06-03 21:14:30 +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-06-09 04:47:19 +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 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +02:00
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-06-03 05:19:30 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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
pcm.h
pcmdec.c Merge remote-tracking branch 'qatar/master' 2011-05-26 03:28:22 +02:00
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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 branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rdt.h
riff.c Merge remote-tracking branch 'qatar/master' 2011-06-10 04:47:23 +02:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +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-05-26 03:28:22 +02:00
rtmppkt.h
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2011-05-26 03:28:22 +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-09 04:47:19 +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-06-04 06:35:17 +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-11 03:51:36 +02:00
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
rtpproto.c Merge remote branch 'qatar/master' 2011-05-10 04:03:17 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
sapdec.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +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
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-06-09 04:47:19 +02:00
soxenc.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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
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
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 udp: support old, crappy non pthread mode 2011-06-04 16:55:22 +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-06-11 03:51:36 +02:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +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-06-09 04:47:19 +02:00
wav.c wav: update size check for ds64 2011-06-03 15:48:08 +02:00
wc3movie.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
westwood.c
wtv.c Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
wtv.h WTV: Add ff_ prefix to the moved fields. 2011-05-01 21:13:18 +02:00
wtvdec.c wtvdec: Avoid gmtime_r() it breaks compile on windows. 2011-05-09 04:17:24 +02:00
wv.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
xa.c
xwma.c
yop.c
yuv4mpeg.c Remove unused variables 2011-06-02 20:06:00 +01:00