virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity
FFmpeg/libavformat
History
Michael Niedermayer 67f5650a78 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rv34: add NEON rv34_idct_add
  rv34: 1-pass inter MB reconstruction
  add SMJPEG muxer
  avformat: split out common SMJPEG code
  pictordec: Use bytestream2 functions
  avconv: use avcodec_encode_audio2()
  pcmenc: use AVCodec.encode2()
  avcodec: bump minor version and add APIChanges for the new audio encoding API
  avcodec: Add avcodec_encode_audio2() as replacement for avcodec_encode_audio()
  avcodec: add a public function, avcodec_fill_audio_frame().
  rv34: Intra 16x16 handling
  rv34: Inter/intra MB code split

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/pictordec.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/rv34dsp.asm
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-17 02:37:30 +01:00
..
4xm.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
a64.c
…
aacdec.c
…
ac3dec.c
…
act.c
…
adts.h
…
adtsenc.c
…
adxdec.c
adx: add AVFMT_GENERIC_INDEX to demuxer flags.
2012-01-03 18:47:41 -05:00
aea.c
…
aiff.h
…
aiffdec.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
aiffenc.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
allformats.c
Merge remote-tracking branch 'qatar/master'
2012-01-17 02:37:30 +01:00
amr.c
…
anm.c
lavf: deprecate av_close_input_stream().
2011-12-12 20:21:47 +01:00
apc.c
…
ape.c
…
apetag.c
…
apetag.h
…
applehttp.c
Enhance HLS seeking.
2012-01-16 03:43:32 +01:00
applehttpproto.c
Merge remote-tracking branch 'qatar/master'
2011-12-30 03:46:24 +01:00
asf.c
Do not map asf metadata key WM/Track to track.
2011-12-31 22:33:58 +01:00
asf.h
…
asfcrypt.c
…
asfcrypt.h
…
asfdec.c
asfdec: Move variable declarations into the blocks they are used in.
2012-01-16 19:21:24 +01:00
asfenc.c
…
assdec.c
…
assenc.c
…
au.c
…
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
Merge remote-tracking branch 'qatar/master'
2012-01-13 01:29:48 +01:00
avi.h
…
avidec.c
avidec: XMPG support
2012-01-14 19:25:08 +01:00
avienc.c
Fix all GNU %Ld
2011-12-13 20:01:49 +01:00
avio_internal.h
lavf: split out ffio_limit()
2011-12-19 11:57:34 +01:00
avio.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
avio.h
Merge remote-tracking branch 'qatar/master'
2012-01-13 01:29:48 +01:00
aviobuf.c
Merge remote-tracking branch 'qatar/master'
2012-01-08 03:34:22 +01:00
avisynth.c
…
avlanguage.c
…
avlanguage.h
…
avs.c
…
bethsoftvid.c
…
bfi.c
…
bink.c
…
bintext.c
…
bit.c
clenaup: #ifdec CONFIG*
2011-12-13 21:08:43 +01:00
bmv.c
…
c93.c
…
cache.c
cache: use av_freep instead of av_free in cache_open
2011-12-31 02:27:10 +01:00
caf.c
…
caf.h
…
cafdec.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
cafenc.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
cavsvideodec.c
…
cdg.c
…
concat.c
…
crcenc.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
crypto.c
…
cutils.c
…
daud.c
…
dfa.c
…
diracdec.c
…
dnxhddec.c
…
dsicin.c
dsicin demuxer: Fix excessive malloc()
2011-12-19 11:57:34 +01:00
dtsdec.c
…
dv.c
dv: fix avpriv_dv_codec_profile with lowres > 0
2011-12-26 22:12:20 +01:00
dv.h
…
dvenc.c
timecode: rename internal ff_* symbols to avpriv_*.
2011-12-12 17:49:34 +01:00
dxa.c
…
eacdata.c
…
electronicarts.c
Merge remote-tracking branch 'qatar/master'
2012-01-08 03:34:22 +01:00
ffm.h
…
ffmdec.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
ffmenc.c
Merge remote-tracking branch 'qatar/master'
2012-01-13 01:29:48 +01:00
ffmeta.h
…
ffmetadec.c
…
ffmetaenc.c
…
file.c
…
filmstripdec.c
…
filmstripenc.c
…
flacdec.c
Merge remote-tracking branch 'qatar/master'
2011-12-22 01:51:53 +01:00
flacenc_header.c
Merge remote-tracking branch 'qatar/master'
2011-12-11 01:05:33 +01:00
flacenc.c
…
flacenc.h
…
flic.c
…
flv.h
Merge remote-tracking branch 'qatar/master'
2011-12-22 01:51:53 +01:00
flvdec.c
flvdec: Fix compiler warning for uninitialized variables
2012-01-04 22:15:47 +02:00
flvenc.c
Merge remote-tracking branch 'qatar/master'
2011-12-16 01:23:15 +01:00
framecrcenc.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
g723_1.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
g729dec.c
…
gif.c
…
gopher.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
gsmdec.c
gsm demuxer: use generic seeking instead of a gsm-specific function.
2012-01-11 08:56:24 -05:00
gxf.c
gxf: remove gxf_ prefix to timecode metadata keys.
2011-12-26 11:22:29 +01:00
gxf.h
…
gxfenc.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
h261dec.c
…
h263dec.c
…
h264dec.c
…
http.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
http.h
…
httpauth.c
…
httpauth.h
…
icodec.c
ico: favour BITMAPHEADER dimensions over IconEntry dimensions
2012-01-13 15:57:34 +01:00
id3v1.c
…
id3v1.h
…
id3v2.c
id3v2: fix compiler warning for uninitialized variables
2011-12-31 17:15:31 +01:00
id3v2.h
…
id3v2enc.c
…
idcin.c
Fix OOM error condition in idcin demuxer.
2012-01-07 13:14:34 +01:00
idroqdec.c
Merge remote-tracking branch 'qatar/master'
2011-12-22 01:51:53 +01:00
idroqenc.c
…
iff.c
…
img2.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
ingenientdec.c
…
internal.h
Merge remote-tracking branch 'qatar/master'
2011-12-22 01:51:53 +01:00
ipmovie.c
Merge remote-tracking branch 'qatar/master'
2012-01-11 02:44:43 +01:00
isom.c
yuv4 libquicktime packed 4:2:0 encoder and decoder.
2012-01-04 15:37:59 +01:00
isom.h
…
iss.c
issdemux: Check packet_size for validity
2011-12-29 15:25:07 +01:00
iv8.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
ivfdec.c
…
ivfenc.c
…
jvdec.c
…
latmenc.c
…
libavformat.v
…
libmodplug.c
…
libnut.c
libnut: NULL priv->nut after nut_demuxer_uninit() as a saftey precaution.
2011-12-08 21:21:34 +01:00
librtmp.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
lmlm4.c
…
loasdec.c
…
lxfdec.c
…
m4vdec.c
…
Makefile
Merge remote-tracking branch 'qatar/master'
2012-01-17 02:37:30 +01:00
matroska.c
…
matroska.h
…
matroskadec.c
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
2012-01-05 21:21:57 +01:00
matroskaenc.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
md5enc.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
md5proto.c
…
metadata.c
…
metadata.h
…
microdvddec.c
…
microdvdenc.c
…
mkvtimestamp_v2.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
mm.c
…
mmf.c
…
mms.c
…
mms.h
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
mmsh.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
mmst.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
mov_chan.c
mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
2012-01-05 10:34:06 -08:00
mov_chan.h
mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
2012-01-05 10:34:06 -08:00
mov.c
mov: cosmetics - move a line to a better position and add a comment
2012-01-16 03:27:01 +01:00
movenc.c
movenc: add FIXME to add alis and rsrc atoms
2012-01-16 03:25:30 +01:00
movenc.h
Merge remote-tracking branch 'qatar/master'
2011-12-16 01:23:15 +01:00
movenchint.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
mp3dec.c
…
mp3enc.c
mp3enc: fix playback with mp3 encoded files on some devices.
2012-01-02 15:34:03 +01:00
mpc8.c
…
mpc.c
…
mpeg.c
…
mpeg.h
…
mpegenc.c
Merge remote-tracking branch 'qatar/master'
2012-01-03 03:06:45 +01:00
mpegts.c
mpegts: remove unused variable
2011-12-31 02:27:11 +01:00
mpegts.h
…
mpegtsenc.c
mpegtsenc: do not reference the deprecated ffmpeg option 'vbsf' in a log message
2012-01-13 15:51:30 +01:00
mpegvideodec.c
…
mpjpeg.c
…
msnwc_tcp.c
…
mtv.c
Merge remote-tracking branch 'qatar/master'
2012-01-08 03:34:22 +01:00
mvi.c
…
mxf.c
mxf: Add PictureEssenceCoding UL for V210.
2011-12-21 16:28:45 +01:00
mxf.h
…
mxfdec.c
mxfdec: Add missing free.
2012-01-16 19:21:24 +01:00
mxfenc.c
mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
2011-12-21 16:28:41 +01:00
mxg.c
mxg: fix compiler warning for uninitialized variables
2011-12-31 17:15:31 +01:00
ncdec.c
…
network.c
Merge remote-tracking branch 'qatar/master'
2011-12-22 01:51:53 +01:00
network.h
…
nsvdec.c
nsvdec: Check av_malloc(string_size)
2011-12-30 01:44:47 +01:00
nullenc.c
…
nut.c
Merge remote-tracking branch 'qatar/master'
2011-12-21 03:40:53 +01:00
nut.h
…
nutdec.c
…
nutenc.c
…
nuv.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
oggdec.c
…
oggdec.h
…
oggenc.c
…
oggparsecelt.c
…
oggparsedirac.c
…
oggparseflac.c
…
oggparseogm.c
…
oggparseskeleton.c
…
oggparsespeex.c
…
oggparsetheora.c
…
oggparsevorbis.c
…
oma.c
Merge remote-tracking branch 'qatar/master'
2011-12-19 02:34:18 +01:00
oma.h
oma: make header compile standalone
2011-12-20 22:38:53 +01:00
omadec.c
Merge remote-tracking branch 'qatar/master'
2011-12-19 02:34:18 +01:00
omaenc.c
lavf: add OpenMG audio muxer.
2011-12-18 16:23:16 +01:00
options.c
…
os_support.c
…
os_support.h
…
pcm.c
…
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pmpdec.c
…
psxstr.c
…
pva.c
…
qcp.c
…
qtpalette.h
…
r3d.c
…
rawdec.c
rawdec: use av_shrink_packet.
2012-01-09 11:02:21 +01:00
rawdec.h
…
rawenc.c
Merge remote-tracking branch 'qatar/master'
2012-01-05 02:03:12 +01:00
rawenc.h
…
rawvideodec.c
…
rdt.c
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
rdt.h
…
riff.c
Fix ff_get_guid for short reads or errors.
2012-01-15 20:37:54 +01:00
riff.h
…
rl2.c
rl2demux: Fix FPE
2011-12-18 23:54:56 +01:00
rm.c
…
rm.h
…
rmdec.c
Merge remote-tracking branch 'qatar/master'
2012-01-08 03:34:22 +01:00
rmenc.c
Merge remote-tracking branch 'qatar/master'
2012-01-03 03:06:45 +01:00
rpl.c
rpl: Fix near infinite loop in index reading due to missing eof check.
2011-12-24 19:57:18 +01:00
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmppkt.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
rtmppkt.h
…
rtmpproto.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
rtp.c
…
rtp.h
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
rtpdec_amr.c
…
rtpdec_asf.c
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
rtpdec_formats.h
…
rtpdec_g726.c
…
rtpdec_h263.c
…
rtpdec_h264.c
…
rtpdec_latm.c
…
rtpdec_mpeg4.c
…
rtpdec_qcelp.c
…
rtpdec_qdm2.c
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
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.c
…
rtpenc_h264.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
rtpenc_latm.c
…
rtpenc_mpv.c
…
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpenc.c
…
rtpenc.h
…
rtpproto.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
rtsp.c
rtsp: Fix compiler warning for uninitialized variable
2012-01-04 22:15:42 +02:00
rtsp.h
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
rtspcodes.h
…
rtspdec.c
…
rtspenc.c
…
sapdec.c
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
sapenc.c
…
sauce.c
…
sauce.h
…
sbgdec.c
Replace PATCHWELCOME by relevant error codes.
2011-12-20 19:08:04 +01:00
sdp.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
seek-test.c
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
seek.c
…
seek.h
…
segafilm.c
segafilm: fail earlier in case theres not enough bytestream left for a
2011-12-25 04:49:23 +01:00
segment.c
segment: fix FPE when segment_list_size is 0
2012-01-13 15:57:34 +01:00
sierravmd.c
Merge remote-tracking branch 'qatar/master'
2012-01-11 02:44:43 +01:00
siff.c
siff: simplify code by using ffio_limit()
2011-12-19 21:11:09 +01:00
smacker.c
smackerdemuxer: check some values before instead of just after malloc()
2011-12-16 03:25:20 +01:00
smjpeg.c
Merge remote-tracking branch 'qatar/master'
2012-01-17 02:37:30 +01:00
smjpeg.h
avformat: split out common SMJPEG code
2012-01-16 11:29:55 +01:00
smjpegdec.c
avformat: split out common SMJPEG code
2012-01-16 11:29:55 +01:00
smjpegenc.c
add SMJPEG muxer
2012-01-16 11:29:55 +01:00
sol.c
…
sox.h
…
soxdec.c
soxdec: check av_malloc return.
2011-12-19 19:11:49 +01:00
soxenc.c
Merge remote-tracking branch 'qatar/master'
2011-12-12 01:25:37 +01:00
spdif.c
…
spdif.h
…
spdifdec.c
…
spdifenc.c
spdifenc: use special alignment for DTS-HD length_code
2012-01-05 16:27:07 -08:00
srtdec.c
…
swf.h
…
swfdec.c
…
swfenc.c
…
tcp.c
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
thp.c
thp: simplify overallocate checks.
2011-12-16 06:02:14 +01:00
tiertexseq.c
…
tls.c
avio: Add an URLProtocol flag for indicating that a protocol uses network
2012-01-05 23:56:52 +02:00
tmv.c
…
tta.c
tta: Fix returned error code at EOF
2012-01-07 09:59:15 -05:00
tty.c
…
txd.c
txd/westwood: remove demuxer specific overallocate solutions as the new generic code
2011-12-16 16:58:20 +01:00
udp.c
udp: fix segfault on closing
2012-01-14 17:14:18 +01:00
url.h
Merge remote-tracking branch 'qatar/master'
2012-01-06 02:45:12 +01:00
utils.c
Merge remote-tracking branch 'qatar/master'
2012-01-13 01:29:48 +01:00
vc1test.c
…
vc1testenc.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00
version.h
Merge remote-tracking branch 'qatar/master'
2012-01-17 02:37:30 +01:00
voc.c
…
voc.h
…
vocdec.c
…
vocenc.c
…
vorbiscomment.c
…
vorbiscomment.h
Merge remote-tracking branch 'qatar/master'
2011-12-13 00:39:48 +01:00
vqf.c
Merge remote-tracking branch 'qatar/master'
2012-01-08 03:34:22 +01:00
wav.c
Cosmetics: Improve 'too short LIST' error message in wav.c.
2011-12-14 15:11:10 +01:00
wc3movie.c
…
westwood.c
txd/westwood: remove demuxer specific overallocate solutions as the new generic code
2011-12-16 16:58:20 +01:00
wtv.c
wtv: fix memleaks during normal operation
2012-01-11 01:34:30 +01:00
wtv.h
…
wtvdec.c
wtvdec: fix a few memleaks as show by valgrind with the FATE test.
2012-01-12 20:09:16 +01:00
wtvenc.c
…
wv.c
…
xa.c
…
xmv.c
…
xwma.c
…
yop.c
…
yuv4mpeg.c
Use more designated initializers.
2011-12-30 20:00:53 +01:00