Michael Niedermayer aff0912da5 Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd' ... * commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd': mpegts: Provide an option to override the pcr period Conflicts: doc/muxers.texi libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-06-10 23:55:57 +02:00
..
4xm.c	Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'	2014-05-18 13:10:24 +02:00
Makefile	Fix compilation with --disable-everything --enable-demuxer=matroska.	2014-05-31 16:29:02 +02:00
a64.c	Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb'	2014-05-18 13:25:18 +02:00
aacdec.c	…
ac3dec.c	…
act.c	…
adp.c	…
adtsenc.c	…
adxdec.c	…
aea.c	…
afc.c	…
aiff.h	…
aiffdec.c	Do not limit blocksize when reading PCM from aiff.	2014-06-03 03:07:55 +02:00
aiffenc.c	…
allformats.c	Autodetect Asterisk raw pcm with extension "sln".	2014-05-22 15:15:04 +02:00
amr.c	…
anm.c	…
apc.c	…
ape.c	Use correct msvc type specifiers for ptrdiff_t and size_t.	2014-04-24 18:01:30 +02:00
apetag.c	…
apetag.h	…
aqtitledec.c	…
asf.c	…
asf.h	…
asfcrypt.c	…
asfcrypt.h	…
asfdec.c	avformat/asfdec: Use a parser for mpeg4-asp to find has_b_frames	2014-06-03 15:23:30 +02:00
asfenc.c	avformat/asfenc: honor the maximum of 63 payloads	2014-05-13 00:54:55 +02:00
assdec.c	…
assenc.c	…
ast.c	…
ast.h	…
astdec.c	…
astenc.c	avformat/astenc: avoid using AVCodecContext.frame_number	2014-05-05 16:46:47 +02:00
au.c	…
audiointerleave.c	lavf/audiointerleave: return more meaningful error codes	2014-05-20 00:00:45 +02:00
audiointerleave.h	…
avc.c	…
avc.h	…
avformat.h	Allow values >31bit for -analyzeduration.	2014-06-10 14:28:34 +02:00
avformatres.rc	…
avi.h	…
avidec.c	avformat/avidec: allow rounding errors between scale/rate and timebase	2014-06-04 05:04:13 +02:00
avienc.c	Refuse to mux H.264 with fourcc H264 into avi without startcode.	2014-05-23 16:20:22 +02:00
avio.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
avio.h	…
avio_internal.h	fix various typos	2014-06-03 10:58:19 -08:00
aviobuf.c	avformat/aviobuf/ff_get_line: also accept \r as end of line character	2014-05-17 23:49:05 +02:00
avisynth.c	avisynth: set duration of audio streams	2014-05-16 14:41:02 +02:00
avlanguage.c	…
avlanguage.h	…
avr.c	…
avs.c	…
bethsoftvid.c	…
bfi.c	…
bink.c	…
bintext.c	…
bit.c	…
bluray.c	…
bmv.c	…
boadec.c	…
brstm.c	fix various typos	2014-06-03 10:58:19 -08:00
c93.c	…
cache.c	…
caf.c	…
caf.h	…
cafdec.c	…
cafenc.c	Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.	2014-05-30 07:26:18 +02:00
cavsvideodec.c	avformat/cavsvideodec: Fix probing when the file extension is avs	2014-06-09 05:17:34 +02:00
cdg.c	…
cdxl.c	…
cinedec.c	…
concat.c	…
concatdec.c	lavf/concatdec: implement automatic conversions.	2014-04-29 13:25:59 +02:00
crcenc.c	…
crypto.c	…
cutils.c	…
data_uri.c	…
daud.c	…
dfa.c	…
diracdec.c	…
dnxhddec.c	…
dsfdec.c	ff_id3v2_read: add option to limit ID3 magic number search	2014-04-19 04:25:01 +02:00
dsicin.c	…
dtsdec.c	…
dtshddec.c	…
dv.c	Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'	2014-05-18 14:53:41 +02:00
dv.h	…
dvenc.c	lavf/dvenc: use av_fifo_alloc_array	2014-05-20 00:00:45 +02:00
dxa.c	…
eacdata.c	…
electronicarts.c	…
epafdec.c	…
ffm.h	…
ffmdec.c	fix various typos	2014-06-03 10:58:19 -08:00
ffmenc.c	…
ffmeta.h	…
ffmetadec.c	…
ffmetaenc.c	…
file.c	…
file_open.c	…
filmstripdec.c	…
filmstripenc.c	…
flac_picture.c	…
flac_picture.h	…
flacdec.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
flacenc.c	Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'	2014-06-01 14:16:29 +02:00
flacenc.h	Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'	2014-06-01 14:16:29 +02:00
flacenc_header.c	Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'	2014-06-01 14:16:29 +02:00
flic.c	…
flv.h	…
flvdec.c	Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'	2014-06-01 23:51:41 +02:00
flvenc.c	avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.	2014-06-07 12:03:31 +02:00
format.c	…
framecrcenc.c	…
framehash.c	avformat/framehash: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:04:32 +02:00
frmdec.c	…
ftp.c	lavf/ftp: favour EPSV over PASV command	2014-05-20 00:00:45 +02:00
g722.c	…
g723_1.c	…
g729dec.c	…
gif.c	…
gifdec.c	…
golomb_tab.c	…
gopher.c	…
gsmdec.c	…
gxf.c	…
gxf.h	…
gxfenc.c	…
h261dec.c	…
h263dec.c	avformat/h263dec/h263_probe: Check TR	2014-05-07 03:42:21 +02:00
h264dec.c	…
hdsenc.c	…
hevc.c	fix various typos	2014-06-03 10:58:19 -08:00
hevc.h	…
hevcdec.c	…
hls.c	…
hlsenc.c	Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'	2014-05-17 03:13:05 +02:00
hlsproto.c	…
hnm.c	avformat/hnm: fix decoding of 256x256 video	2014-04-16 01:37:38 +02:00
http.c	avformat/http: remove never twice executable loop	2014-05-14 20:44:15 +02:00
http.h	…
httpauth.c	…
httpauth.h	…
icodec.c	avformat/ico: use avmalloc(z)_array()	2014-04-16 19:41:41 +02:00
icoenc.c	avformat/ico: use avmalloc(z)_array()	2014-04-16 19:41:41 +02:00
id3v1.c	…
id3v1.h	…
id3v2.c	Use correct msvc type specifiers for ptrdiff_t and size_t.	2014-04-24 18:01:30 +02:00
id3v2.h	ff_id3v2_read: add option to limit ID3 magic number search	2014-04-19 04:25:01 +02:00
id3v2enc.c	…
idcin.c	…
idroqdec.c	…
idroqenc.c	…
iff.c	avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks	2014-04-20 00:22:20 +02:00
ilbc.c	…
img2.c	…
img2.h	…
img2_alias_pix.c	avformat/img2_alias_pix: fix 2 unused variable warnings	2014-04-29 18:47:27 +02:00
img2_brender_pix.c	…
img2dec.c	avformat/img2dec: fix typo	2014-04-14 21:40:59 +02:00
img2enc.c	…
ingenientdec.c	…
internal.h	Various small spelling fixes.	2014-04-22 20:44:31 +02:00
ipmovie.c	…
ircam.c	…
ircam.h	…
ircamdec.c	…
ircamenc.c	…
isom.c	Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().	2014-05-21 22:48:11 +02:00
isom.h	Read mov files where the moov atom is hidden within a free atom.	2014-05-31 16:57:27 +02:00
iss.c	…
iv8.c	…
ivfdec.c	…
ivfenc.c	…
jacosubdec.c	…
jacosubenc.c	…
jvdec.c	…
latmenc.c	…
libavformat.v	…
libgme.c	…
libmodplug.c	…
libnut.c	avformat/libnut: use av_mallocz_array()	2014-05-15 01:56:52 +02:00
libquvi.c	…
librtmp.c	Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'	2014-04-30 21:43:56 +02:00
libssh.c	…
lmlm4.c	…
loasdec.c	Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'	2014-05-04 00:19:35 +02:00
log2_tab.c	…
lvfdec.c	…
lxfdec.c	…
m4vdec.c	…
matroska.c	Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'	2014-05-01 16:03:30 +02:00
matroska.h	matroskadec: read the CodecDelay element	2014-04-30 21:00:01 +02:00
matroskadec.c	avformat/matroskadec: fix off by 1 error in matroska_read_seek()	2014-05-30 13:55:03 +02:00
matroskaenc.c	lavf/matroskaenc: Fix Cues on Audio for WebM DASH	2014-06-06 21:36:11 +02:00
md5enc.c	…
md5proto.c	…
metadata.c	…
metadata.h	…
mgsts.c	…
microdvddec.c	…
microdvdenc.c	…
mkvtimestamp_v2.c	…
mlvdec.c	avformat/mlvdec: close any additional .Mxx files	2014-04-27 15:34:27 +02:00
mm.c	…
mmf.c	avformat/mmf: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:04:20 +02:00
mms.c	…
mms.h	…
mmsh.c	Use correct msvc type specifiers for ptrdiff_t and size_t.	2014-04-24 18:01:30 +02:00
mmst.c	Use correct msvc type specifiers for ptrdiff_t and size_t.	2014-04-24 18:01:30 +02:00
mov.c	avformat/mov: fix "warning: variable altitude set but not used" warning	2014-06-06 15:46:03 +02:00
mov_chan.c	…
mov_chan.h	…
movenc.c	avformat/movenc: use av_malloc(z)_array()	2014-06-08 15:26:03 +02:00
movenc.h	Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'	2014-05-18 22:29:27 +02:00
movenchint.c	Revert "avformat/movenchint: Fix movhinting with ff_rtp_chain_mux_open() from abb810db036628e11a5171134ebe320b187ee6d6"	2014-05-31 12:54:00 +02:00
mp3dec.c	avformat/mp3dec: check the number of frames per buffer size	2014-05-12 21:05:47 +02:00
mp3enc.c	Fix the mime types for MPEG and MPEG-TS formats	2014-05-22 23:34:59 +02:00
mpc.c	…
mpc8.c	…
mpeg.c	fix various typos	2014-06-03 10:58:19 -08:00
mpeg.h	lavf/mpeg.h: Remove an unused definition.	2014-04-27 14:54:29 +02:00
mpegenc.c	lavf: use av_fifo_freep	2014-05-07 23:39:47 +02:00
mpegts.c	lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.	2014-06-09 23:20:14 +02:00
mpegts.h	avformat/mpegtsenc: Allow DTS audio copy to TS streams	2014-04-27 14:24:29 +02:00
mpegtsenc.c	Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'	2014-06-10 23:55:57 +02:00
mpegvideodec.c	…
mpjpeg.c	…
mpl2dec.c	…
mpsubdec.c	…
msnwc_tcp.c	…
mtv.c	…
mux.c	avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()	2014-06-02 14:48:22 +02:00
mvdec.c	Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'	2014-04-19 20:17:33 +02:00
mvi.c	…
mxf.c	…
mxf.h	…
mxfdec.c	…
mxfenc.c	Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'	2014-05-15 19:16:57 +02:00
mxg.c	…
ncdec.c	…
network.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
network.h	…
nistspheredec.c	…
noproxy-test.c	…
nsvdec.c	…
nullenc.c	…
nut.c	avformat/nut: support storing RFC 3389 comfort noise	2014-05-01 02:13:31 +02:00
nut.h	avformat/nutenc: add mode that omits the index	2014-05-29 03:37:37 +02:00
nutdec.c	avformat/nutdec: Fix handling of older 4.0 files	2014-05-29 01:48:02 +02:00
nutenc.c	avformat/nutenc: cleaner version check	2014-06-10 16:36:41 +02:00
nuv.c	…
oggdec.c	Fix dont and doesnt typos	2014-04-27 15:14:32 +02:00
oggdec.h	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggenc.c	oggenc: Set the right AVOption size for the pref_duration option	2014-06-06 19:22:14 +03:00
oggparsecelt.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsedirac.c	…
oggparseflac.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseogm.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseopus.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseskeleton.c	Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'	2014-05-01 17:26:06 +02:00
oggparsespeex.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsetheora.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsevorbis.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsevp8.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oma.c	…
oma.h	…
omadec.c	ff_id3v2_read: add option to limit ID3 magic number search	2014-04-19 04:25:01 +02:00
omaenc.c	…
options.c	…
options_table.h	Allow values >31bit for -analyzeduration.	2014-06-10 14:28:34 +02:00
os_support.c	…
os_support.h	…
paf.c	…
pcm.c	lavf/pcm: remove redundant check	2014-04-20 20:56:02 +02:00
pcm.h	…
pcmdec.c	Autodetect Asterisk raw pcm with extension "sln".	2014-05-22 15:15:04 +02:00
pcmenc.c	…
pjsdec.c	…
pmpdec.c	avformat/pmpdec: remove cur_dts timestamp hack	2014-04-21 01:29:08 +02:00
psxstr.c	…
pva.c	…
pvfdec.c	…
qcp.c	…
qtpalette.h	…
r3d.c	…
rawdec.c	avformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is found at the file start	2014-06-10 14:42:19 +02:00
rawdec.h	avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flags	2014-06-10 14:20:39 +02:00
rawenc.c	Fix the mime types for MPEG and MPEG-TS formats	2014-05-22 23:34:59 +02:00
rawenc.h	…
rawvideodec.c	…
rdt.c	Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87'	2014-05-24 13:21:33 +02:00
rdt.h	…
realtextdec.c	…
redspark.c	…
replaygain.c	avformat/replaygain: fix mixed declaration and statement	2014-04-18 01:16:27 +02:00
replaygain.h	Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'	2014-04-17 21:45:58 +02:00
riff.c	Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'	2014-04-23 20:47:13 +02:00
riff.h	ff_put_wav_header: add flag to force WAVEFORMATEX	2014-04-30 16:41:35 +02:00
riffdec.c	…
riffenc.c	Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'	2014-05-17 20:22:56 +02:00
rl2.c	…
rm.c	…
rm.h	…
rmdec.c	Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'	2014-05-01 17:49:57 +02:00
rmenc.c	…
rmsipr.c	…
rmsipr.h	…
rpl.c	…
rsd.c	…
rso.c	…
rso.h	…
rsodec.c	…
rsoenc.c	…
rtmp.h	…
rtmpcrypt.c	…
rtmpcrypt.h	…
rtmpdh.c	…
rtmpdh.h	…
rtmphttp.c	…
rtmppkt.c	Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'	2014-06-01 23:56:22 +02:00
rtmppkt.h	Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'	2014-06-01 23:56:22 +02:00
rtmpproto.c	Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'	2014-06-02 00:32:30 +02:00
rtp.c	…
rtp.h	…
rtpdec.c	…
rtpdec.h	rtpdec: make the NTP time values unsigned.	2014-05-09 15:10:57 +02:00
rtpdec_amr.c	…
rtpdec_asf.c	…
rtpdec_formats.h	…
rtpdec_g726.c	…
rtpdec_h263.c	…
rtpdec_h263_rfc2190.c	…
rtpdec_h264.c	…
rtpdec_ilbc.c	…
rtpdec_jpeg.c	…
rtpdec_latm.c	…
rtpdec_mpeg4.c	…
rtpdec_mpeg12.c	…
rtpdec_mpegts.c	…
rtpdec_qcelp.c	…
rtpdec_qdm2.c	…
rtpdec_qt.c	…
rtpdec_svq3.c	…
rtpdec_vp8.c	…
rtpdec_xiph.c	Use correct msvc type specifiers for ptrdiff_t and size_t.	2014-04-24 18:01:30 +02:00
rtpenc.c	avformat/rtpenc: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:02:44 +02:00
rtpenc.h	…
rtpenc_aac.c	…
rtpenc_amr.c	…
rtpenc_chain.c	Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'	2014-05-31 12:53:46 +02:00
rtpenc_chain.h	…
rtpenc_h263.c	…
rtpenc_h263_rfc2190.c	…
rtpenc_h264.c	…
rtpenc_jpeg.c	…
rtpenc_latm.c	…
rtpenc_mpv.c	…
rtpenc_vp8.c	…
rtpenc_xiph.c	…
rtpproto.c	…
rtpproto.h	…
rtsp.c	Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'	2014-05-31 12:53:46 +02:00
rtsp.h	…
rtspcodes.h	…
rtspdec.c	avformat/rtspdec: Use av_mallocz_array()	2014-05-27 20:42:50 +02:00
rtspenc.c	…
samidec.c	…
sapdec.c	…
sapenc.c	Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'	2014-05-31 12:53:46 +02:00
sauce.c	…
sauce.h	…
sbgdec.c	…
sctp.c	…
sdp.c	Use correct msvc type specifiers for ptrdiff_t and size_t.	2014-04-24 18:01:30 +02:00
sdr2.c	…
seek-test.c	…
seek.c	…
seek.h	…
segafilm.c	…
segment.c	avformat/segment: Use av_malloc_array()	2014-05-05 23:11:04 +02:00
sierravmd.c	…
siff.c	…
smacker.c	…
smjpeg.c	…
smjpeg.h	…
smjpegdec.c	…
smjpegenc.c	…
smoothstreamingenc.c	Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'	2014-05-25 13:07:45 +02:00
smush.c	…
sol.c	…
sox.h	…
soxdec.c	…
soxenc.c	…
spdif.c	…
spdif.h	…
spdifdec.c	…
spdifenc.c	…
srtdec.c	…
srtenc.c	…
srtp.c	…
srtp.h	…
srtpproto.c	…
subfile.c	…
subtitles.c	…
subtitles.h	…
subviewer1dec.c	…
subviewerdec.c	…
swf.c	…
swf.h	…
swfdec.c	…
swfenc.c	lavf: use av_fifo_freep	2014-05-07 23:39:47 +02:00
takdec.c	…
tcp.c	…
tedcaptionsdec.c	…
tee.c	avformat/tee: print errors for each failed bitstream filter	2014-04-26 21:08:44 +02:00
thp.c	…
tiertexseq.c	…
tls.c	…
tmv.c	…
tta.c	…
tty.c	…
txd.c	Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'	2014-04-22 13:30:23 +02:00
udp.c	avformat/udp: fix build on MINIX	2014-06-07 14:43:07 +02:00
uncodedframecrcenc.c	…
unix.c	…
url-test.c	…
url.c	…
url.h	…
urldecode.c	…
urldecode.h	…
utils.c	Merge remote-tracking branch 'cehoyos/master'	2014-06-10 18:22:41 +02:00
vc1test.c	…
vc1testenc.c	…
version.h	Allow values >31bit for -analyzeduration.	2014-06-10 14:28:34 +02:00
vivo.c	…
voc.c	…
voc.h	…
vocdec.c	…
vocenc.c	…
vorbiscomment.c	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
vorbiscomment.h	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
vplayerdec.c	…
vqf.c	…
w64.c	…
w64.h	…
wavdec.c	avformat/wavdec: enlarge probe_packets for wav	2014-04-19 03:54:10 +02:00
wavenc.c	Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'	2014-05-18 21:05:46 +02:00
wc3movie.c	…
webvttdec.c	…
webvttenc.c	avcodec/webvttenc: add webvtt encoder	2014-05-25 03:04:14 +02:00
westwood_aud.c	…
westwood_vqa.c	…
wtv.h	…
wtv_common.c	…
wtvdec.c	avformat/wtvdec: ignore mpeg2 extradata	2014-05-01 18:36:27 +02:00
wtvenc.c	ff_put_wav_header: add flag to force WAVEFORMATEX	2014-04-30 16:41:35 +02:00
wv.c	…
wv.h	…
wvdec.c	…
wvenc.c	…
xa.c	…
xmv.c	avformat/xmv: use av_malloc_array()	2014-04-15 13:51:48 +02:00
xwma.c	avformat/xwma: fix memleak of dpds_table	2014-04-29 20:48:03 +02:00
yop.c	yop: only set extradata size after it has been successfully allocated	2014-05-18 10:22:42 +02:00
yuv4mpeg.h	Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'	2014-05-18 13:37:25 +02:00
yuv4mpegdec.c	Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'	2014-05-18 14:02:31 +02:00
yuv4mpegenc.c	Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'	2014-05-18 13:37:25 +02:00