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/libavcodec
History
Michael Niedermayer 388b7ac07a Revert "Set channel layout in flac decoder." 
This reverts commit 2ef2496cd19eb833f4ad22a5051c11be80d09598.

Conflicts:

	libavcodec/Makefile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-24 04:22:20 +01:00
..
alpha
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
arm
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
avr32
…
bfin
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mips
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ppc
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
sh4
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
sparc
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
x86
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
4xm.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
8bps.c
…
8svx.c
…
a64colors.h
…
a64enc.h
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
a64multienc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
a64tables.h
…
aac_ac3_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
aac_ac3_parser.h
…
aac_adtstoasc_bsf.c
…
aac_parser.c
…
aac_tablegen_decl.h
…
aac_tablegen.c
…
aac_tablegen.h
…
aac.h
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
aacadtsdec.c
…
aacadtsdec.h
…
aaccoder.c
…
aacdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-23 04:31:55 +01:00
aacdectab.h
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
aacenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
aacenc.h
…
aacps_tablegen.c
…
aacps_tablegen.h
…
aacps.c
…
aacps.h
…
aacpsdata.c
…
aacpsy.c
…
aacpsy.h
…
aacsbr.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
aacsbr.h
…
aacsbrdata.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
aactab.c
…
aactab.h
…
aandcttab.c
…
aandcttab.h
…
aasc.c
…
ac3_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
ac3_parser.h
…
ac3.c
…
ac3.h
…
ac3dec_data.c
…
ac3dec_data.h
…
ac3dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
ac3dec.h
…
ac3dsp.c
Merge remote-tracking branch 'qatar/master'
2012-02-02 02:24:09 +01:00
ac3dsp.h
…
ac3enc_fixed.c
…
ac3enc_float.c
…
ac3enc_opts_template.c
…
ac3enc_template.c
Merge remote-tracking branch 'qatar/master'
2012-02-14 01:53:31 +01:00
ac3enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ac3enc.h
…
ac3tab.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
ac3tab.h
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
acelp_filters.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
acelp_filters.h
…
acelp_pitch_delay.c
…
acelp_pitch_delay.h
…
acelp_vectors.c
…
acelp_vectors.h
…
adpcm_data.c
…
adpcm_data.h
…
adpcm.c
…
adpcm.h
Merge remote-tracking branch 'qatar/master'
2012-02-01 02:36:09 +01:00
adpcmenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
adx_parser.c
adx parser: set duration
2012-02-20 15:08:41 -05:00
adx.c
…
adx.h
…
adxdec.c
…
adxenc.c
…
alac.c
…
alacenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-12 01:06:13 +01:00
allcodecs.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
alsdec.c
als: prevent infinite loop in zero_remaining().
2012-02-17 12:35:08 -08:00
amr.h
…
amrnbdata.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
amrnbdec.c
…
amrwbdata.h
…
amrwbdec.c
…
anm.c
…
ansi.c
ansi: Fix use of uninitalized width/height warning.
2012-02-11 08:23:42 +01:00
apedec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ass_split.c
…
ass_split.h
…
ass.c
ass: use av_asprintf() instead of a temporary stack buffer.
2012-01-30 23:28:26 +01:00
ass.h
…
assdec.c
assdec: fix wrong alloc pointer check.
2012-01-30 23:28:36 +01:00
assenc.c
…
asv1.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
atrac1.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
atrac1data.h
…
atrac3.c
Merge remote-tracking branch 'qatar/master'
2012-02-17 00:35:06 +01:00
atrac3data.h
…
atrac.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
atrac.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
audioconvert.c
…
audioconvert.h
…
aura.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
avcodec.h
lavc: introduce av_get_pcm_codec.
2012-02-22 11:37:32 +01:00
avfft.c
…
avfft.h
…
avpacket.c
…
avs.c
…
bethsoftvideo.c
Merge remote-tracking branch 'qatar/master'
2012-02-17 00:35:06 +01:00
bethsoftvideo.h
…
bfi.c
…
bgmc.c
…
bgmc.h
…
bink.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
binkaudio.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
binkdata.h
…
binkdsp.c
…
binkdsp.h
…
bintext.c
…
bintext.h
…
bit_depth_template.c
…
bitstream_filter.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
bitstream.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
bmp.c
…
bmp.h
…
bmpenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-13 02:06:44 +01:00
bmv.c
…
bytestream.h
Merge remote-tracking branch 'qatar/master'
2012-02-10 01:20:07 +01:00
c93.c
…
cabac_functions.h
…
cabac.c
…
cabac.h
…
cavs_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
cavs.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
cavs.h
…
cavsdata.h
…
cavsdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
cavsdsp.c
…
cavsdsp.h
…
cbrt_tablegen.c
…
cbrt_tablegen.h
…
cdgraphics.c
…
cdxl.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
celp_filters.c
…
celp_filters.h
…
celp_math.c
…
celp_math.h
…
cga_data.c
…
cga_data.h
…
chomp_bsf.c
…
cinepak.c
…
cljr.c
Merge remote-tracking branch 'qatar/master'
2012-02-13 02:06:44 +01:00
codec_names.sh
…
cook.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
cookdata.h
…
cos_tablegen.c
…
crystalhd.c
…
cscd.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
cyuv.c
…
dca_parser.c
…
dca.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
dca.h
…
dcadata.h
…
dcadsp.c
…
dcadsp.h
…
dcaenc.c
…
dcaenc.h
…
dcahuff.h
…
dct32_fixed.c
…
dct32_float.c
…
dct32.c
…
dct32.h
…
dct-test.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
dct.c
…
dct.h
…
dctref.c
…
dctref.h
…
dfa.c
…
dirac_arith.c
…
dirac_arith.h
…
dirac_parser.c
…
dirac.c
…
dirac.h
…
diracdec.c
diracdec: fix use of deprecated funnctions
2012-02-16 23:01:47 +01:00
diracdsp.c
…
diracdsp.h
…
dnxhd_parser.c
Handle interlaced formats (two coding units together make one full frame)
2012-02-16 03:05:22 +01:00
dnxhddata.c
…
dnxhddata.h
…
dnxhddec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
dnxhdenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
dnxhdenc.h
…
dpcm.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
dpx.c
…
dpxenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
dsicinav.c
…
dsputil_template.c
…
dsputil.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
dsputil.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
dump_extradata_bsf.c
…
dv_tablegen.c
…
dv_tablegen.h
…
dv_vlc_data.h
…
dv.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
dvbsub_parser.c
…
dvbsub.c
…
dvbsubdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
dvdata.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
dvdata.h
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
dvdsub_parser.c
…
dvdsubdec.c
…
dvdsubenc.c
…
dvquant.h
dv: Split dvdata.h into dvdata.h and dvquant.h
2012-02-09 19:16:15 -08:00
dwt.c
dwt: fix about a dozen "warning: assignment from incompatible pointer type"
2012-02-05 02:08:03 +01:00
dwt.h
…
dxa.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
dxtory.c
…
dxva2_h264.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
dxva2_internal.h
…
dxva2_mpeg2.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
dxva2_vc1.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
dxva2.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
dxva2.h
…
eac3_data.c
…
eac3_data.h
…
eac3dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-10 01:20:07 +01:00
eac3enc.c
…
eac3enc.h
…
eacmv.c
…
eaidct.c
…
eamad.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
eatgq.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
eatgv.c
Merge remote-tracking branch 'qatar/master'
2012-02-14 01:53:31 +01:00
eatqi.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
elbg.c
…
elbg.h
…
error_resilience.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
escape124.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
escape130.c
…
faandct.c
…
faandct.h
…
faanidct.c
…
faanidct.h
…
faxcompr.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
faxcompr.h
…
fft_fixed.c
…
fft_float.c
…
fft-fixed-test.c
…
fft-internal.h
…
fft-test.c
…
fft.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
fft.h
…
ffv1.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
ffwavesynth.c
…
flac_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
flac.c
Revert "Set channel layout in flac decoder."
2012-02-24 04:22:20 +01:00
flac.h
…
flacdata.c
…
flacdata.h
…
flacdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
flacenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-07 01:40:29 +01:00
flashsv2enc.c
flashsv2enc: switch to encode2()
2012-02-24 03:30:42 +01:00
flashsv.c
…
flashsvenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
flicvideo.c
…
flv.h
…
flvdec.c
…
flvenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
fmtconvert.c
…
fmtconvert.h
…
fraps.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
frwu.c
frwu: lowercase the FRWU codec name
2012-02-02 18:44:52 +01:00
g722.c
…
g722.h
…
g722dec.c
…
g722enc.c
…
g723_1_data.h
…
g723_1.c
…
g726.c
…
g729.h
…
g729data.h
…
g729dec.c
g729dec: fix 'warning: assignment from incompatible pointer type'
2012-02-16 23:25:51 +01:00
g729postfilter.c
…
g729postfilter.h
…
get_bits.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
gif.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
gifdec.c
…
golomb-test.c
Merge remote-tracking branch 'qatar/master'
2012-02-02 02:24:09 +01:00
golomb.c
…
golomb.h
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
gsm_parser.c
gsm parser: set duration
2012-02-20 15:08:41 -05:00
gsm.h
gsm.h: Fix project reference
2012-02-01 04:43:06 +01:00
gsmdec_data.c
…
gsmdec_data.h
…
gsmdec_template.c
…
gsmdec.c
…
h261_parser.c
…
h261.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
h261.h
…
h261data.h
…
h261dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
h261enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
h263_parser.c
…
h263_parser.h
…
h263.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
h263.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
h263data.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
h263dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
h264_cabac.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
h264_cavlc.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
h264_direct.c
…
h264_loopfilter.c
…
h264_mp4toannexb_bsf.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
h264_mvpred.h
…
h264_parser.c
H264 parser: enable header parsing/frame type detection for is_avc.
2012-02-19 15:29:10 +01:00
h264_ps.c
…
h264_refs.c
…
h264_sei.c
…
h264.c
h264: use av_fast_padded_malloc()
2012-02-19 03:57:54 +01:00
h264.h
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
h264data.h
…
h264dsp_template.c
…
h264dsp.c
…
h264dsp.h
…
h264idct_template.c
…
h264idct.c
…
h264pred_template.c
…
h264pred.c
…
h264pred.h
…
huffman.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
huffman.h
…
huffyuv.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
idcinvideo.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
iff.c
iff: Fix decode_ham_plane32() buf_size.
2012-02-14 01:22:38 +01:00
iirfilter.c
…
iirfilter.h
…
imc.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
imcdata.h
…
imgconvert.c
Merge remote-tracking branch 'qatar/master'
2012-02-09 01:27:12 +01:00
imgconvert.h
…
imx_dump_header_bsf.c
…
indeo2.c
…
indeo2data.h
…
indeo3.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
indeo3data.h
…
indeo4.c
…
indeo4data.h
…
indeo5.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
indeo5data.h
…
intelh263dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
internal.h
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
interplayvideo.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
intrax8.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
intrax8.h
…
intrax8dsp.c
…
intrax8huf.h
…
inverse.c
…
ituh263dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ituh263enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ivi_common.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ivi_common.h
…
ivi_dsp.c
…
ivi_dsp.h
…
j2k_dwt.c
…
j2k_dwt.h
…
j2k.c
…
j2k.h
…
j2kdec.c
…
j2kenc.c
j2kenc: switch to encode2
2012-02-24 04:12:40 +01:00
jfdctfst.c
libavcodec: Prefix fdct_ifast, fdct_ifast248
2012-02-15 22:06:38 +02:00
jfdctint_template.c
…
jfdctint.c
doxygen: Do not include license boilerplates in Doxygen comment blocks.
2012-02-06 19:39:24 +01:00
jpegls.c
jpeglsdec: fix bpp & limit.
2012-02-14 01:22:38 +01:00
jpegls.h
…
jpeglsdec.c
jpeglsdec: Prevent out of array write.
2012-02-14 01:22:38 +01:00
jpeglsdec.h
…
jpeglsenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
jrevdct.c
libavcodec: Add ff_ prefix to j_rev_dct*
2012-02-15 22:06:46 +02:00
jvdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
kbdwin.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
kbdwin.h
…
kgv1dec.c
kgv1dec: Increase offsets array size so it is large enough.
2012-01-30 10:16:23 -08:00
kmvc.c
Merge remote-tracking branch 'qatar/master'
2012-01-31 02:46:26 +01:00
lagarith.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
lagarithrac.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
lagarithrac.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
latm_parser.c
…
lcl.h
…
lcldec.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
lclenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
libaacplus.c
…
libavcodec.v
lavc/lavf: remove unnecessary symbols from the symbol version script.
2012-01-31 07:26:31 +01:00
libcelt_dec.c
…
libdirac_libschro.c
…
libdirac_libschro.h
…
libdirac.h
…
libdiracdec.c
…
libfaac.c
…
libgsm.c
libgsm: Fix compilation.
2012-01-28 23:21:03 +01:00
libmp3lame.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
libopencore-amr.c
libopencore-amr: fix memleak
2012-01-28 22:08:20 +01:00
libopenjpegdec.c
Support decoding rgba64 with libopenjpeg.
2012-02-01 15:51:18 +01:00
libopenjpegenc.c
…
libschroedinger.c
…
libschroedinger.h
…
libschroedingerdec.c
…
libschroedingerenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
libspeexdec.c
…
libspeexenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
libstagefright.cpp
Fix libstagefright compilation
2012-02-09 23:55:33 +01:00
libtheoraenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
libutvideo.cpp
Fix libutvideo compilation.
2012-02-07 18:28:00 +01:00
libvo-aacenc.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
libvo-amrwbenc.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
libvorbis.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
libvpxdec.c
…
libvpxenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
libx264.c
libx264: unbreak libx264rgb
2012-02-18 02:31:38 +01:00
libxavs.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
libxvid_internal.h
…
libxvid_rc.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
libxvidff.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
ljpegenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
loco.c
…
lpc.c
Merge remote-tracking branch 'qatar/master'
2012-02-07 01:40:29 +01:00
lpc.h
Merge remote-tracking branch 'qatar/master'
2012-02-07 01:40:29 +01:00
lsp.c
…
lsp.h
…
lzw.c
…
lzw.h
…
lzwenc.c
…
mace.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
Makefile
Revert "Set channel layout in flac decoder."
2012-02-24 04:22:20 +01:00
mathops.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
mdct_fixed.c
…
mdct_float.c
…
mdct.c
…
mdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mimic.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mjpeg2jpeg_bsf.c
…
mjpeg_parser.c
…
mjpeg.c
…
mjpeg.h
…
mjpega_dump_header_bsf.c
…
mjpegbdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
mjpegdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mjpegdec.h
…
mjpegenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
mjpegenc.h
…
mlp_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-23 04:31:55 +01:00
mlp_parser.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
mlp.c
…
mlp.h
…
mlpdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
mlpdsp.c
…
mmvideo.c
…
motion_est_template.c
…
motion_est.c
…
motion-test.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
motionpixels_tablegen.c
…
motionpixels_tablegen.h
…
motionpixels.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
movsub_bsf.c
…
mp3_header_compress_bsf.c
…
mp3_header_decompress_bsf.c
…
mpc7.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
mpc7data.h
…
mpc8.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpc8data.h
…
mpc8huff.h
…
mpc.c
…
mpc.h
Merge remote-tracking branch 'qatar/master'
2012-02-03 03:51:32 +01:00
mpcdata.h
…
mpeg4audio.c
…
mpeg4audio.h
…
mpeg4data.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpeg4video_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
mpeg4video_parser.h
…
mpeg4video.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
mpeg4video.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpeg4videodec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpeg4videoenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
mpeg12.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpeg12.h
…
mpeg12data.c
Merge remote-tracking branch 'qatar/master'
2012-01-31 02:46:26 +01:00
mpeg12data.h
…
mpeg12decdata.h
…
mpeg12enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
mpegaudio_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
mpegaudio_tablegen.c
…
mpegaudio_tablegen.h
…
mpegaudio.c
…
mpegaudio.h
…
mpegaudiodata.c
…
mpegaudiodata.h
…
mpegaudiodec_float.c
…
mpegaudiodec.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
mpegaudiodecheader.c
…
mpegaudiodecheader.h
…
mpegaudiodectab.h
…
mpegaudiodsp_fixed.c
…
mpegaudiodsp_float.c
…
mpegaudiodsp_template.c
…
mpegaudiodsp.c
…
mpegaudiodsp.h
…
mpegaudioenc.c
…
mpegaudiotab.h
…
mpegvideo_common.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpegvideo_enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
mpegvideo_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
mpegvideo_xvmc.c
…
mpegvideo.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
mpegvideo.h
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
mqc.c
…
mqc.h
…
mqcdec.c
…
mqcenc.c
…
msgsmdec.c
…
msgsmdec.h
…
msmpeg4.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
msmpeg4.h
…
msmpeg4data.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
msmpeg4data.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
msrle.c
…
msrledec.c
Merge remote-tracking branch 'qatar/master'
2012-02-14 01:53:31 +01:00
msrledec.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
msvideo1.c
…
msvideo1enc.c
msvideo1enc: switch to encode2()
2012-02-24 04:13:01 +01:00
mxpegdec.c
…
nellymoser.c
…
nellymoser.h
…
nellymoserdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
nellymoserenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
noise_bsf.c
…
nuv.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
options.c
Merge remote-tracking branch 'qatar/master'
2012-02-14 01:53:31 +01:00
os2threads.h
…
pamenc.c
pamenc: allocate the correct packetsize for mono.
2012-02-19 04:15:22 +01:00
parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
parser.h
Merge remote-tracking branch 'qatar/master'
2012-02-11 01:22:22 +01:00
pcm_tablegen.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
pcm_tablegen.h
…
pcm-mpeg.c
…
pcm.c
lavc: provide aliases to the PCM A-law/mu-law codecs
2012-02-07 15:48:33 +01:00
pcx.c
…
pcxenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
pgssubdec.c
Add option forced_subs_only for Bluray subtitles.
2012-01-30 11:25:59 +01:00
pictordec.c
…
png.c
…
png.h
Merge remote-tracking branch 'qatar/master'
2012-01-30 05:20:58 +01:00
pngdec.c
pngdec: Print error if signature is wrong.
2012-02-22 03:37:18 +01:00
pngdsp.c
Merge remote-tracking branch 'qatar/master'
2012-01-30 05:20:58 +01:00
pngdsp.h
Partially revert "Fix png decoding on x86."
2012-02-10 23:18:52 +01:00
pngenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
pnm_parser.c
…
pnm.c
pamdec: fix mono support.
2012-02-19 16:26:46 +01:00
pnm.h
…
pnmdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
pnmenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
proresdata.c
prores: move data shared between decoder and encoder to common file
2012-02-15 07:14:45 +01:00
proresdata.h
prores: move data shared between decoder and encoder to common file
2012-02-15 07:14:45 +01:00
proresdec2.c
proresdec2: use ff_dsputil_init() avoid deprecated ff_ less variant.
2012-02-16 19:55:16 +01:00
proresdec_lgpl.c
Merge remote-tracking branch 'qatar/master'
2012-02-23 04:31:55 +01:00
proresdec.h
…
proresdsp.c
prores: initialise encoder and decoder parts only when needed
2012-02-17 16:49:30 +01:00
proresdsp.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
proresenc_anatoliy.c
proresenc_anatoliy: switch to encode2
2012-02-24 04:13:27 +01:00
proresenc_kostya.c
Merge remote-tracking branch 'qatar/master'
2012-02-23 04:31:55 +01:00
psymodel.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
psymodel.h
…
pthread.c
threads: Perform the generic progress cleanup more carefully.
2012-02-12 20:24:29 +01:00
ptx.c
…
put_bits.h
…
qcelpdata.h
…
qcelpdec.c
…
qdm2_tablegen.c
…
qdm2_tablegen.h
…
qdm2.c
…
qdm2data.h
…
qdrw.c
…
qpeg.c
…
qtrle.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
qtrleenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
r210dec.c
r210dec: check return value of avcodec_alloc_frame()
2012-01-28 22:08:20 +01:00
r210enc.c
r210enc and y41penc: don't set same pkt->size twice
2012-02-22 03:45:43 +01:00
ra144.c
…
ra144.h
…
ra144dec.c
…
ra144enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-03 03:51:32 +01:00
ra288.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
ra288.h
…
rangecoder.c
…
rangecoder.h
…
ratecontrol.c
…
ratecontrol.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
raw.c
Allow encoding rawvideo RGBA64 and friends.
2012-02-09 23:25:46 +01:00
raw.h
…
rawdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-09 01:27:12 +01:00
rawenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-10 01:20:07 +01:00
rdft.c
…
rdft.h
…
rectangle.h
…
remove_extradata_bsf.c
…
resample2.c
…
resample.c
…
rl2.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
rl.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rle.c
…
rle.h
…
roqaudioenc.c
roqaudioenc: check return value of avcodec_alloc_frame()
2012-01-28 22:08:21 +01:00
roqvideo.c
…
roqvideo.h
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
roqvideodec.c
…
roqvideoenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
rpza.c
…
rtjpeg.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rtjpeg.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rv10.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rv10enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
rv20enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
rv30.c
rv30: check block type validity
2012-02-14 19:03:10 +01:00
rv30data.h
…
rv30dsp.c
…
rv34_parser.c
…
rv34.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rv34.h
Merge remote-tracking branch 'qatar/master'
2012-02-15 01:52:14 +01:00
rv34data.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rv34dsp.c
rv34: change most "int stride" into "ptrdiff_t stride".
2012-02-20 14:58:25 -08:00
rv34dsp.h
rv34: change most "int stride" into "ptrdiff_t stride".
2012-02-20 14:58:25 -08:00
rv34vlc.h
…
rv40.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
rv40data.h
…
rv40dsp.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
rv40vlc2.h
…
s3tc.c
…
s3tc.h
…
s302m.c
…
sbr.h
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
sbrdsp.c
…
sbrdsp.h
…
sgi.h
…
sgidec.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
sgienc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
shorten.c
Merge remote-tracking branch 'qatar/master'
2012-02-17 00:35:06 +01:00
simple_idct_template.c
simpleidct: fix project name.
2012-02-01 04:43:06 +01:00
simple_idct.c
…
simple_idct.h
…
sinewin_tablegen.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
sinewin_tablegen.h
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
sinewin.c
…
sinewin.h
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
sipr16k.c
…
sipr16kdata.h
…
sipr.c
…
sipr.h
…
siprdata.h
…
smacker.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
smc.c
…
snow.c
snow: zero scratchbuf.
2012-02-16 06:25:32 +01:00
snow.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
snowdata.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
snowdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
snowenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
sonic.c
…
sp5x.h
…
sp5xdec.c
…
srtdec.c
…
srtenc.c
…
sunrast.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
sunrast.h
avcodec: add a Sun Rasterfile encoder
2012-02-17 14:28:56 -05:00
sunrastenc.c
sunrastenc: set keyframe flag for the output packet.
2012-02-19 15:54:27 +01:00
svq1_cb.h
…
svq1_vlc.h
…
svq1.c
…
svq1.h
…
svq1dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
svq1enc_cb.h
…
svq1enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
svq3.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
synth_filter.c
…
synth_filter.h
…
tableprint.h
…
targa.c
…
targa.h
…
targaenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
thread.h
…
tiertexseqv.c
…
tiff.c
…
tiff.h
…
tiffenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
timecode.c
timecode: drop lavc timecode on next bump.
2012-02-02 14:31:17 +01:00
timecode.h
timecode: drop lavc timecode on next bump.
2012-02-02 14:31:17 +01:00
tmv.c
…
truemotion1.c
…
truemotion1data.h
…
truemotion2.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
truespeech_data.h
…
truespeech.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
tscc.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
tta.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
twinvq_data.h
…
twinvq.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
txd.c
…
ulti_cb.h
…
ulti.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
unary.h
…
utils.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
utvideo.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
v210dec.c
v210dec: check for coded_frame allocation failure
2012-02-06 08:00:31 +01:00
v210dec.h
…
v210enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
v210x.c
v210x: check for return value of avcodec_alloc_frame()
2012-01-28 22:08:21 +01:00
v308dec.c
…
v308enc.c
v308enc: switch to encode2()
2012-02-23 23:38:20 +01:00
v408dec.c
v408: do not unconditionally compile codecs
2012-02-06 00:29:32 +01:00
v408enc.c
v408enc: switch to encode2()
2012-02-23 23:42:04 +01:00
v410dec.c
…
v410enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
vaapi_h264.c
…
vaapi_internal.h
…
vaapi_mpeg2.c
…
vaapi_mpeg4.c
…
vaapi_vc1.c
…
vaapi.c
…
vaapi.h
…
vb.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
vble.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vc1_parser.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
vc1.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vc1.h
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
vc1acdata.h
…
vc1data.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vc1data.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vc1dec.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
vc1dsp.c
…
vc1dsp.h
…
vcr1.c
…
vda_h264.c
…
vda_internal.h
…
vda.c
…
vda.h
…
vdpau_internal.h
…
vdpau.c
…
vdpau.h
…
version.h
lavc: introduce av_get_pcm_codec.
2012-02-22 11:37:32 +01:00
vmdav.c
…
vmnc.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
vorbis_data.c
…
vorbis_enc_data.h
…
vorbis.c
Merge remote-tracking branch 'qatar/master'
2012-02-03 03:51:32 +01:00
vorbis.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vorbisdec.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vorbisenc.c
…
vp3_parser.c
…
vp3.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp3data.h
…
vp3dsp.c
…
vp5.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp5data.h
…
vp6.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp6data.h
…
vp6dsp.c
…
vp8_parser.c
…
vp8.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp8.h
Merge remote-tracking branch 'qatar/master'
2012-02-07 01:40:29 +01:00
vp8data.h
…
vp8dsp.c
…
vp8dsp.h
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
vp56.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp56.h
…
vp56data.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp56data.h
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
vp56dsp.c
…
vp56dsp.h
…
vp56rac.c
…
vqavideo.c
…
w32pthreads.h
…
wavpack.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
wma.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
wma.h
…
wmadata.h
…
wmadec.c
Merge remote-tracking branch 'qatar/master'
2012-02-19 01:47:10 +01:00
wmaenc.c
…
wmalosslessdec.c
wmalossless: Fix infinite loop.
2012-02-19 22:08:21 +01:00
wmaprodata.h
…
wmaprodec.c
Merge remote-tracking branch 'qatar/master'
2012-02-18 02:20:19 +01:00
wmavoice_data.h
…
wmavoice.c
…
wmv2.c
Merge remote-tracking branch 'qatar/master'
2012-02-16 01:34:37 +01:00
wmv2.h
…
wmv2dec.c
…
wmv2enc.c
Merge remote-tracking branch 'qatar/master'
2012-02-20 01:29:30 +01:00
wnv1.c
…
ws-snd1.c
Merge remote-tracking branch 'qatar/master'
2012-02-17 00:35:06 +01:00
xan.c
…
xiph.c
…
xiph.h
…
xl.c
…
xsubdec.c
…
xsubenc.c
…
xvmc_internal.h
…
xvmc.h
…
xwd.h
…
xwddec.c
…
xwdenc.c
xwdenc: switch to encode2().
2012-02-17 20:46:37 +01:00
xxan.c
Merge remote-tracking branch 'qatar/master'
2012-01-29 00:34:59 +01:00
y41pdec.c
…
y41penc.c
r210enc and y41penc: don't set same pkt->size twice
2012-02-22 03:45:43 +01:00
yop.c
…
yuv4dec.c
…
yuv4enc.c
yuv4enc: switch to encode2()
2012-02-23 23:40:51 +01:00
zmbv.c
zmbv: remove unused variable
2012-02-04 01:12:04 +01:00
zmbvenc.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00