generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e1a983e601
ffmpeg/libavformat
History
Michael Niedermayer 11a1033c9f Merge remote-tracking branch 'qatar/master' 
* qatar/master: (23 commits)
  build: cosmetics: Reorder some lists in a more logical fashion
  x86: pngdsp: Fix assembly for OS/2
  fate: add test for RTjpeg in nuv with frameheader
  rtmp: send check_bw as notification
  g723_1: clip argument for 15-bit version of normalize_bits()
  g723_1: use all LPC vectors in formant postfilter
  id3v2: Support v2.2 PIC
  avplay: fix build with lavfi disabled.
  avconv: split configuring filter configuration to a separate file.
  avconv: split option parsing into a separate file.
  mpc8: do not leave padding after last frame in buffer for the next decode call
  mpegaudioenc: list supported channel layouts.
  mpegaudiodec: don't print an error on > 1 frame in a packet.
  api-example: update to new audio encoding API.
  configure: add --enable/disable-random option
  doc: cygwin: Update list of FATE package requirements
  build: Remove all installed headers and header directories on uninstall
  build: change checkheaders to use regular build rules
  rtmp: Add a new option 'rtmp_subscribe'
  rtmp: Add support for subscribing live streams
  ...

Conflicts:
	Makefile
	common.mak
	configure
	doc/examples/decoding_encoding.c
	ffmpeg.c
	libavcodec/g723_1.c
	libavcodec/mpegaudiodec.c
	libavcodec/x86/pngdsp.asm
	libavformat/version.h
	library.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-09 00:51:02 +02:00
..
4xm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
a64.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aacdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ac3dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
act.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
adtsenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
adxdec.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
aea.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aiff.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aiffdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aiffenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
allformats.c WavPack muxer 2012-07-29 01:28:12 +00:00
amr.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
anm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
apc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ape.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
apetag.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
apetag.h Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
apetagenc.c lavf/apetag: move common stuff between writer and reader to single file 2012-07-29 02:31:27 +00:00
asf.c Do not map asf metadata key WM/Track to track. 2011-12-31 22:33:58 +01:00
asf.h asfenc: rename put_guid to ff_put_guid 2011-11-05 16:51:25 +01:00
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
asfcrypt.h
asfdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
asfenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
assdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
assenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
au.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
audiointerleave.c audiointerleave: check timebase 2012-04-01 21:21:13 +02:00
audiointerleave.h
avc.c Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avc.h Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avformat.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avi.h Merge remote-tracking branch 'qatar/master' 2011-11-28 01:07:11 +01:00
avidec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avienc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02: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-06-22 22:34:02 +02:00
avio.h avio: Document that write_packet() is not allowed to change its input 2012-07-28 01:16:09 +02:00
aviobuf.c aviobuf: Fix warning about discarded qualifier 2012-07-27 12:46:51 +02:00
avisynth.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avlanguage.c
avlanguage.h
avs.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bethsoftvid.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bfi.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bink.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bintext.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bit.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bluray.c bluray protocol 2012-03-03 04:30:49 +01:00
bmv.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
c93.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cache.c cache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer type" 2012-02-06 02:04:09 +01:00
caf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
caf.h
cafdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cafenc.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
cavsvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cdg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cdxl.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
concat.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
crcenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
crypto.c avio: add support for passing options to protocols. 2011-11-13 13:14:39 +01:00
cutils.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
daud.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dfa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
diracdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dnxhddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dsicin.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dtsdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dv.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dvenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dxa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
eacdata.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
electronicarts.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
ffmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ffmeta.h
ffmetadec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ffmetaenc.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
file.c lavf/file: cosmetic: Use "not" instead of "equals zero" 2012-07-05 10:55:49 +02:00
filmstripdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
filmstripenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flacdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flacenc_header.c Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
flacenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flacenc.h
flic.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flv.h Merge remote-tracking branch 'qatar/master' 2012-06-28 23:57:31 +02:00
flvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flvenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
framecrcenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
framehash.c frame{crc/md5}: set the stream timebase from codec timebase. 2012-02-03 09:29:02 +01:00
g723_1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
g729dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gif.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gopher.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
gsmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gxf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gxf.h
gxfenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h261dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h263dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
hls.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
hlsproto.c cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
http.c http: try to detect live akamai streams and dont enable seeking for them 2012-06-28 00:18:24 +02:00
http.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
httpauth.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
icodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
id3v1.c
id3v1.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
id3v2.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
id3v2.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
id3v2enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
idcin.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
idroqdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
idroqenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iff.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ilbc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
img2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
img2dec.c lavf/img2dec: add and document pattern_type option 2012-08-08 23:43:36 +02:00
img2enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ingenientdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
internal.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ipmovie.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
isom.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
isom.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iss.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iv8.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2012-06-21 22:37:43 +02:00
ivfenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jacosubdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jacosubenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
latmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libavformat.v FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
libmodplug.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libnut.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2012-06-04 00:33:42 +02:00
lmlm4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
loasdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
lxfdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
m4vdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
Makefile APE tag writer 2012-07-29 01:28:12 +00:00
matroska.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
matroska.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
matroskadec.c matroskadec: fix lace vs block duration. 2012-08-08 17:54:49 +02:00
matroskaenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
md5enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
md5proto.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
metadata.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
metadata.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mgsts.c Enable generic index/seeking for mgsts demuxer. 2012-03-26 20:03:57 +02:00
microdvddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
microdvdenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mkvtimestamp_v2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mmf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
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-06-20 20:47:46 +02:00
mov_chan.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mov_chan.h Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
mov.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
movenc.c lavf/movenc: use two explicit bytes instead of a short. 2012-08-08 23:13:52 +02:00
movenc.h movenc: Handle need for extra packets to express subtitle duration. 2012-08-04 12:01:24 -07:00
movenchint.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
mp3dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mp3enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpc8.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpeg.h
mpegenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegts.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
mpegtsenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpjpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
msnwc_tcp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mtv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mvi.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxf.h mxfdec: fix frame height vs field height confusion 2012-07-10 13:51:04 +02:00
mxfdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxfenc.c lavf/mxfenc: better error handling with invalid frame rate. 2012-08-08 09:11:25 +02:00
mxg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ncdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
network.c Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
network.h Merge remote-tracking branch 'qatar/master' 2012-07-16 20:45:41 +02:00
nsvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nullenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nut.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nut.h
nutdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nutenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nuv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggdec.h oggdec: add support for Opus codec. 2012-07-20 11:16:52 +02:00
oggenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparsecelt.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparsedirac.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseflac.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseogm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseopus.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparseskeleton.c vorbisdemux: Check private context in theoras gtopts. 2012-03-23 04:29:33 +01:00
oggparsespeex.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
oggparsetheora.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oggparsevorbis.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oma.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
oma.h omadec: make sample rate table large enough to prevent out of array reading. 2012-04-16 18:36:39 +02:00
omadec.c omadec: switch to AVSTREAM_PARSE_FULL_RAW 2012-07-26 03:30:35 +02:00
omaenc.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
options_table.h Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23' 2012-07-29 23:04:49 +02:00
options.c options: Fix warning about incompatible pointer type 2012-07-30 03:48:46 +02:00
os_support.c Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
os_support.h Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
paf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcm.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcm.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pmpdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
psxstr.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pva.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
qcp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
qtpalette.h
r3d.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rawdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
rawenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rawenc.h
rawvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rdt.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rdt.h
realtextdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
riff.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
riff.h rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
rl2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rm.h
rmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rpl.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rso.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rso.h Merge remote-tracking branch 'qatar/master' 2011-11-03 02:16:26 +01:00
rsodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rsoenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtmp.h Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
rtmpcrypt.c Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
rtmpcrypt.h Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rtmpdh.c Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
rtmpdh.h Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00
rtmphttp.c Merge remote-tracking branch 'qatar/master' 2012-07-18 01:27:19 +02:00
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2012-08-02 23:34:01 +02:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2012-08-02 23:34:01 +02:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
rtp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtp.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_amr.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_asf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rtpdec_g726.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_h263_rfc2190.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
rtpdec_h263.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_h264.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_ilbc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_latm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_mpeg4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_qcelp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_qdm2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_qt.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_svq3.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_vp8.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec_xiph.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpdec.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpenc_aac.c
rtpenc_amr.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_chain.h Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_h263_rfc2190.c rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 2012-03-01 16:08:32 +02:00
rtpenc_h263.c Change all uses of restrict to use av_restrict instead. 2012-06-17 00:38:39 +02:00
rtpenc_h264.c Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
rtpenc_latm.c
rtpenc_mpv.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
rtsp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
rtspcodes.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
rtspenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
samidec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
sapenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sauce.c
sauce.h
sbgdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sctp.c sctp: add port missing error message 2012-07-25 20:31:16 +03:00
sdp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
seek-test.c seek-test: support printing multiple packets 2012-05-04 14:40:22 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
seek.h Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
segafilm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
segment.c Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
sierravmd.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
siff.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smacker.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smjpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smjpeg.h Replace Libav with FFmpeg in license headers for files created by me 2012-06-29 01:58:34 +00:00
smjpegdec.c Replace Libav with FFmpeg in license headers for files created by me 2012-06-29 01:58:34 +00:00
smjpegenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smush.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sol.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sox.h
soxdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
soxenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
spdif.c
spdif.h
spdifdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
spdifenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
srtdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
srtenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
subtitles.c lavf/subtitles: add some SMIL helpers. 2012-06-29 20:20:02 +02:00
subtitles.h lavf/subtitles: add some SMIL helpers. 2012-06-29 20:20:02 +02:00
subviewerdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
swf.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
swfdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
swfenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tcp.c Merge remote-tracking branch 'qatar/master' 2012-07-25 22:00:06 +02:00
thp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tiertexseq.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tls.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
tmv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tta.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tty.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
txd.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
udp.c udp: do not call pthread_{mutex,cond}_destroy when not initialized. 2012-08-06 10:06:26 +02:00
url.h url: add ffurl_closep() which also sets the context pointer to NULL 2012-06-01 14:47:30 +02:00
urldecode.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
urldecode.h Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
utils.c lavf: block special characters in dump metadata 2012-08-08 21:13:15 +02:00
vc1test.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vc1testenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
voc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
voc.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
vocdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vocenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vorbiscomment.c
vorbiscomment.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
vqf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wav.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wc3movie.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
westwood_aud.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
westwood_vqa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wtv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wtv.h
wtvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wtvenc.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
wv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wvenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xmv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xwma.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
yop.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
yuv4mpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00