virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
9d89d1d484
FFmpeg/libavcodec
History
Derek Buitenhuis 59db014b5b Revert "lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE" 
You should not need to enable verbose logging and all the output that comes
with it in order to get things like the obtained bitrate from a first
pass encode. Many things parse this output.

Also, since it is marked as info in libx264, it should be marked as
info in libavcodec as well.

This reverts commit 911519caec.
2012-09-13 10:57:50 -04:00
..
alpha dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
arm dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
avr32
bfin dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
mips Optimization of AC3 floating point decoder for MIPS 2012-09-05 20:09:56 +02:00
ppc dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
sh4
sparc Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
4xm.c lavc: add missing new line to some messages 2012-09-01 15:59:30 +02:00
8bps.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
8svx.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
a64colors.h
a64enc.h
a64multienc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
a64tables.h
aac_ac3_parser.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
aac_ac3_parser.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aac_adtstoasc_bsf.c
aac_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
aac_tablegen_decl.h
aac_tablegen.c
aac_tablegen.h
aac.h
aacadtsdec.c
aacadtsdec.h
aaccoder.c aaccoder: switch to av_assert 2012-09-04 04:38:28 +02:00
aacdec.c aacdec/lcg_random: fix harmless integer overflow 2012-09-11 03:02:51 +02:00
aacdectab.h
aacenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
aacenc.h
aacps_tablegen.c
aacps_tablegen.h
aacps.c
aacps.h
aacpsdata.c
aacpsdsp.c
aacpsdsp.h
aacpsy.c aacpsy: use exp2(f) instead of pow(f)(2,...) 2012-09-09 13:02:08 +02:00
aacpsy.h
aacsbr.c
aacsbr.h
aacsbrdata.h
aactab.c
aactab.h
aandcttab.c
aandcttab.h
aasc.c aasc: 8bit support 2012-08-09 00:02:05 +00:00
ac3_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ac3_parser.h
ac3.c
ac3.h
ac3dec_data.c
ac3dec_data.h
ac3dec.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
ac3dec.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
ac3dsp.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
ac3dsp.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
ac3enc_fixed.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ac3enc_float.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ac3enc_opts_template.c avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member 2012-09-04 23:13:44 +03:00
ac3enc_template.c
ac3enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ac3enc.h
ac3tab.c
ac3tab.h
acelp_filters.c acelp_filters: switch to avassert 2012-08-18 05:02:08 +02:00
acelp_filters.h
acelp_pitch_delay.c acelp_pitch_delay: add missing libm.h include for exp2() 2012-09-05 21:56:41 +02:00
acelp_pitch_delay.h
acelp_vectors.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
acelp_vectors.h
adpcm_data.c
adpcm_data.h
adpcm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
adpcm.h
adpcmenc.c adpcmenc: Calculate the IMA_QT predictor without overflow 2012-09-04 15:30:58 +03:00
adx_parser.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
adx.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
adx.h
adxdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
adxenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
alac.c lavc: add missing new line to some messages 2012-09-01 15:59:30 +02:00
alacenc.c Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
allcodecs.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
alsdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
amr.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
amrnbdata.h
amrnbdec.c amrnbdec: silence a warning about unsigned cant be negative 2012-09-06 01:18:55 +02:00
amrwbdata.h
amrwbdec.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
anm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ansi.c ansi: erase screen on first frame 2012-09-01 15:23:39 +02:00
apedec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
ass_split.c ass subtitles: Fix valgrind warnings. 2012-08-05 09:11:11 -07:00
ass_split.h
ass.c ass: assert that the timsstamps fitted in the buffers 2012-09-09 14:19:02 +02:00
ass.h
assdec.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
assenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
asv1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
atrac1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
atrac1data.h
atrac3.c atrac3: replace powf(2,...) by exp2f() 2012-09-10 22:32:56 +02:00
atrac3data.h
atrac.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
atrac.h
audio_frame_queue.c audio_frame_que: remove broken code that is specific to old audio_que 2012-08-29 19:22:29 +02:00
audio_frame_queue.h Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
audioconvert.h
aura.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
avcodec.h add OTF support for attachments 2012-09-10 17:08:18 +02:00
avfft.c
avfft.h
avpacket.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
avrndec.c avrndec: silence warning about incompatible pointer types 2012-08-26 10:24:42 +00:00
avs.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avuidec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
avuienc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bethsoftvideo.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bethsoftvideo.h
bfi.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bgmc.c
bgmc.h
bink.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
binkaudio.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
binkdata.h
binkdsp.c
binkdsp.h
bintext.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bintext.h
bit_depth_template.c
bitstream_filter.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
bitstream.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
bmp_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bmp.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bmp.h
bmpenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
bmv.c bmv_videodec: fix out of array read 2012-08-14 18:58:49 +02:00
bytestream.h
c93.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cabac_functions.h
cabac.c h264: ff_init_cabac_states doesnt use its argument thus remove it 2012-08-26 05:44:46 +02:00
cabac.h h264: ff_init_cabac_states doesnt use its argument thus remove it 2012-08-26 05:44:46 +02:00
cavs_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cavs.c Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
cavs.h Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
cavsdata.c Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
cavsdata.h Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
cavsdec.c cavsdec/decode_mb_b: fix return type 2012-09-11 07:13:49 +02:00
cavsdsp.c Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
cavsdsp.h Merge remote-tracking branch 'qatar/master' 2012-09-08 12:53:44 +02:00
cbrt_tablegen.c
cbrt_tablegen.h
cdgraphics.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
celp_filters.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
celp_filters.h Add a shift parameter to celp_lp_synthesis_filter() 2012-07-22 07:58:53 +02:00
celp_math.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
celp_math.h Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
cga_data.c
cga_data.h
chomp_bsf.c
cinepak.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
cljr.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
cllc.c cllc: simplify/fix swapped data buffer allocation. 2012-08-28 11:37:53 -04:00
codec_desc.c lavc/codec_desc: fix name of wavesynth codec 2012-09-02 10:42:25 +02:00
cook_parser.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
cook.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
cookdata.h
cos_tablegen.c
cpia.c cpia: move reget_buffer after header check 2012-09-01 10:12:33 +02:00
crystalhd.c rename missed CodecID to AVCodecID 2012-08-07 23:57:21 +02:00
cscd.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
cyuv.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dca_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dca_parser.h
dca.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
dca.h Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
dcadata.h Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
dcadec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dcadsp.c
dcadsp.h
dcaenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dcaenc.h
dcahuff.h
dct32_fixed.c
dct32_float.c
dct32.c
dct32.h
dct-test.c dct-test: fix order of evaluation bug 2012-09-08 23:57:37 +02:00
dct.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dct.h
dctref.c
dctref.h
dfa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dirac_arith.c
dirac_arith.h
dirac_parser.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dirac.c lavc: add missing new line to some messages 2012-09-01 15:59:30 +02:00
dirac.h
diracdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
diracdsp.c
diracdsp.h
dnxhd_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dnxhddata.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dnxhddata.h
dnxhddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dnxhdenc.c dsputil/me/pixels: Actually use av_restrict 2012-09-09 03:55:56 +02:00
dnxhdenc.h Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
dpcm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dpx.c dpx: 10 and 12 bit decoding 2012-08-27 18:31:21 +02:00
dpxenc.c dpx: 10 and 12 bit encoding 2012-08-25 03:55:50 +02:00
dsicinav.c dsicinav: fix signed integer overflow 2012-08-31 15:15:59 +02:00
dsputil_template.c dsputil_template: Reindent after recent change 2012-09-09 17:21:37 +02:00
dsputil.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
dsputil.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
dump_extradata_bsf.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dv_profile.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dv_profile.h
dv_tablegen.c
dv_tablegen.h
dv_vlc_data.h
dv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dvbsub_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dvbsub.c dvbsub: reindent after last commit. 2012-08-09 11:22:11 +02:00
dvbsubdec.c dvbsubdec: set width/height from display def if not set. 2012-08-31 19:58:09 +02:00
dvdata.c
dvdata.h
dvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dvdsub_parser.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dvdsubdec.c lavc/dvdsubdec: parse the size from the extradata. 2012-09-04 23:38:29 +02:00
dvdsubenc.c lavc/dvdsubenc: check the type of rectangles. 2012-08-24 12:12:41 +02:00
dwt.c Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
dwt.h Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
dxa.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dxtory.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
dxva2_h264.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dxva2_internal.h
dxva2_mpeg2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dxva2_vc1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dxva2.c
dxva2.h
eac3_data.c
eac3_data.h
eac3dec.c
eac3enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
eac3enc.h
eacmv.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
eaidct.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
eaidct.h Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
eamad.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
eatgq.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
eatgv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
eatqi.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
elbg.c elbg: Fix an assert 2012-09-04 18:37:54 +03:00
elbg.h
error_resilience.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
escape124.c escape124: Fix long == 64 assumtation. 2012-08-17 07:16:16 +02:00
escape130.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
exr.c exr: fix decoding ZIP16 and height not multiple of 16 2012-08-29 09:33:41 +00:00
faandct.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
faandct.h
faanidct.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
faanidct.h
faxcompr.c faxcompr: fix out of array read 2012-09-07 12:36:00 +02:00
faxcompr.h
fft_fixed.c
fft_float.c
fft-fixed-test.c Fix misspellings of FFmpeg 2012-07-19 18:44:46 +02:00
fft-internal.h
fft-test.c fft-test: switch to new cpu flags API 2012-08-16 22:04:46 +02:00
fft.c Optimization of AC3 floating point decoder for MIPS 2012-09-05 20:09:56 +02:00
fft.h Optimization of AC3 floating point decoder for MIPS 2012-09-05 20:09:56 +02:00
ffv1.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
ffwavesynth.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flac_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flac.c Merge remote-tracking branch 'qatar/master' 2012-07-12 23:57:00 +02:00
flac.h
flacdata.c
flacdata.h
flacdec.c Merge remote-tracking branch 'qatar/master' 2012-08-21 16:17:13 +02:00
flacdsp_template.c
flacdsp.c Merge remote-tracking branch 'qatar/master' 2012-07-19 22:01:31 +02:00
flacdsp.h
flacenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
flashsv2enc.c flashsv2enc: only encode diff blocks when needed 2012-09-08 05:36:34 +02:00
flashsv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flashsvenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flicvideo.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
flv.h
flvdec.c lavc/flvdec: return meaningful error codes 2012-09-11 01:15:10 +02:00
flvenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
fmtconvert.c Optimization of AC3 floating point decoder for MIPS 2012-09-05 20:09:56 +02:00
fmtconvert.h Optimization of AC3 floating point decoder for MIPS 2012-09-05 20:09:56 +02:00
frame_thread_encoder.c frame_thread_encoder: pass frame pict type and quality 2012-08-29 04:26:59 +02:00
frame_thread_encoder.h frame_thread_encoder: pass private options 2012-08-29 04:26:36 +02:00
fraps.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
frwu.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
g722.c
g722.h
g722dec.c avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member 2012-09-04 23:13:38 +03:00
g722enc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
g723_1_data.h Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
g723_1.c g723_1: add some const for more correctness 2012-09-05 21:03:17 +02:00
g726.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
g729.h
g729data.h
g729dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
g729postfilter.c
g729postfilter.h
get_bits.h
gif.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
gifdec.c gifdec: return more meaningful error codes 2012-08-07 20:58:20 +00:00
golomb-test.c
golomb.c
golomb.h
gsm_parser.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
gsm.h
gsmdec_data.c
gsmdec_data.h
gsmdec_template.c
gsmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h261_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h261.c
h261.h
h261data.c
h261data.h
h261dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h261enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h263_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h263_parser.h
h263.c
h263.h
h263data.h
h263dec.c lavc/h263dec: return or propagate proper error codes 2012-09-11 01:15:10 +02:00
h264_cabac.c h264_cabac: switch to av_assert 2012-07-26 16:33:17 +02:00
h264_cavlc.c h264_cavlc: switch forgotten assert to av_assert 2012-08-13 05:59:44 +02:00
h264_direct.c
h264_loopfilter.c
h264_mb_template.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264_mc_template.c h264_mc_template: switch to av_assert 2012-08-01 04:19:46 +02:00
h264_mp4toannexb_bsf.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
h264_mvpred.h
h264_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264_ps.c h264: print num_reorder_frames in debug output 2012-08-04 15:42:44 +02:00
h264_refs.c
h264_sei.c h264: fix x264 build detection 2012-08-13 04:58:15 +02:00
h264.c Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9' 2012-09-06 16:05:40 +02:00
h264.h h264: Workaround invalid MPEG-TS broadcasts 2012-08-20 05:47:42 +02:00
h264data.h
h264dsp_template.c
h264dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
h264dsp.h
h264idct_template.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
h264idct.c
h264pred_template.c
h264pred.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264pred.h
huffman.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
huffman.h Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
huffyuv.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
idcinvideo.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
iff.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
iirfilter.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
iirfilter.h
imc.c imc: use exp2 instead of pow(2,...) 2012-09-09 13:02:08 +02:00
imcdata.h
imgconvert.c imgconvert: silence some const incompatible pointer warnings. 2012-09-05 18:44:42 +02:00
imgconvert.h
imx_dump_header_bsf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
indeo2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
indeo2data.h
indeo3.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
indeo3data.h
indeo4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
indeo4data.h
indeo5.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
indeo5data.h
intelh263dec.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
interplayvideo.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
intrax8.c Merge remote-tracking branch 'qatar/master' 2012-09-02 21:01:10 +02:00
intrax8.h Merge remote-tracking branch 'qatar/master' 2012-09-02 21:01:10 +02:00
intrax8dsp.c Merge remote-tracking branch 'qatar/master' 2012-09-02 21:01:10 +02:00
intrax8dsp.h Merge remote-tracking branch 'qatar/master' 2012-09-03 17:41:17 +02:00
intrax8huf.h
inverse.c
ituh263dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ituh263enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ivi_common.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ivi_common.h
ivi_dsp.c
ivi_dsp.h
j2k_dwt.c
j2k_dwt.h
j2k.c
j2k.h
j2kdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
j2kenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jacosub.h
jacosubdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jfdctfst.c
jfdctint_template.c
jfdctint.c
jpegls.c
jpegls.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
jpeglsdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jpeglsdec.h
jpeglsenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
jrevdct.c
jvdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
kbdwin.c kbdwin: switch to av_assert 2012-07-22 05:18:01 +02:00
kbdwin.h
kgv1dec.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
kmvc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
lagarith.c lagarith: fix alignment on buffers passed into prediction dsp code. 2012-08-23 19:03:57 +02:00
lagarithrac.c
lagarithrac.h
latm_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
lcl.h
lcldec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
lclenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libaacplus.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libavcodec.v
libcelt_dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libfaac.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libfdk-aacenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libgsm.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libilbc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libmp3lame.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libopencore-amr.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libopenjpegdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libopenjpegenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libopus_dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libschroedinger.c Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
libschroedinger.h
libschroedingerdec.c Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
libschroedingerenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libspeexdec.c lavc: add missing new line to some messages 2012-09-01 15:59:30 +02:00
libspeexenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libstagefright.cpp Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libtheoraenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libtwolame.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libutvideo.h
libutvideodec.cpp Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libutvideoenc.cpp Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libvo-aacenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libvo-amrwbenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libvorbisdec.c libvorbisdec: fix const nitpick warning 2012-08-30 18:01:14 +02:00
libvorbisenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libvpxdec.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
libvpxenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
libx264.c Revert "lavc/libx264: remap X264_LOG_INFO loglevel from AV_LOG_INFO to VERBOSE" 2012-09-13 10:57:50 -04:00
libxavs.c Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a' 2012-09-05 14:44:05 +02:00
libxvid_rc.c
libxvid.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
libxvid.h
ljpegenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
loco.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
lpc.c Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
lpc.h Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
lsp.c lsp: change assert to av_assert 2012-09-03 23:26:14 +02:00
lsp.h
lzw.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
lzw.h
lzwenc.c
mace.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mathops.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mdct_fixed.c
mdct_float.c
mdct.c
mdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
microdvddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mimic.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mjpeg2jpeg_bsf.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mjpeg_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mjpeg.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mjpeg.h Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mjpega_dump_header_bsf.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mjpegbdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mjpegdec.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mjpegdec.h
mjpegenc.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mjpegenc.h
mlp_parser.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
mlp_parser.h
mlp.c
mlp.h
mlpdec.c lavc: add missing new line to some messages 2012-09-01 15:59:30 +02:00
mlpdsp.c
mmvideo.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
motion_est_template.c motion_est_template: switch to av_assert 2012-08-04 00:06:20 +02:00
motion_est.c motion_est: switch some asserts to av_assert 2012-08-15 21:39:53 +02:00
motion-test.c lavc: put motion test back. 2012-09-03 23:23:40 +02:00
motionpixels_tablegen.c
motionpixels_tablegen.h
motionpixels.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
movsub_bsf.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
movtextdec.c movtextdec: Don't emit errors for normal duration-end packets. 2012-08-15 22:03:16 -07:00
movtextenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mp3_header_compress_bsf.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
mp3_header_decompress_bsf.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
mpc7.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpc7data.h
mpc8.c Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +02:00
mpc8data.h
mpc8huff.h
mpc.c
mpc.h
mpcdata.h
mpeg4audio.c mpeg4audio: dont take the SBR flag too serious. 2012-08-23 14:43:12 +02:00
mpeg4audio.h
mpeg4data.h
mpeg4video_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpeg4video_parser.h
mpeg4video.c
mpeg4video.h
mpeg4videodec.c mpeg4videodec: Fix "warning: dc_pred_dir may be used uninitialized in this function" 2012-09-09 03:15:46 +02:00
mpeg4videoenc.c Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
mpeg12.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpeg12.h
mpeg12data.c
mpeg12data.h
mpeg12decdata.h
mpeg12enc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
mpegaudio_parser.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
mpegaudio_tablegen.c
mpegaudio_tablegen.h mpegaudio_tablegen: try to fix hardcoded tables 2012-08-02 06:10:28 +02:00
mpegaudio.c
mpegaudio.h mp3dec: adjust IMDCT scaling to avoid overflows 2012-08-02 04:21:53 +02:00
mpegaudiodata.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
mpegaudiodata.h Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
mpegaudiodec_float.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegaudiodec.c mpegaudiodec: replace pow(2.0,...) by exp2() 2012-09-10 22:34:18 +02:00
mpegaudiodecheader.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegaudiodecheader.h
mpegaudiodectab.h
mpegaudiodsp_data.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
mpegaudiodsp_fixed.c
mpegaudiodsp_float.c
mpegaudiodsp_template.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
mpegaudiodsp.c
mpegaudiodsp.h Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
mpegaudioenc.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
mpegaudiotab.h
mpegvideo_enc.c ratecontrol: correct predictor in case of stuffing 2012-09-11 17:50:14 +02:00
mpegvideo_motion.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mpegvideo_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegvideo_xvmc.c
mpegvideo.c mpegvideo: skip ff_print_debug_info() for VDPAU 2012-09-13 16:22:42 +02:00
mpegvideo.h ratecontrol: correct predictor in case of stuffing 2012-09-11 17:50:14 +02:00
mqc.c
mqc.h
mqcdec.c
mqcenc.c
msgsmdec.c
msgsmdec.h
msmpeg4.c msmpeg4v2: initialize mb_type array 2012-08-15 05:29:28 +02:00
msmpeg4.h
msmpeg4data.c
msmpeg4data.h
msmpeg4enc.c
msrle.c msrle: fix regression causing null ptr dereference 2012-08-11 02:20:06 +02:00
msrledec.c
msrledec.h
mss1.c Merge remote-tracking branch 'qatar/master' 2012-09-04 17:04:51 +02:00
mss2.c Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
mss2dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
mss2dsp.h Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
mss3.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mss4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mss12.c Merge remote-tracking branch 'qatar/master' 2012-09-04 17:04:51 +02:00
mss12.h Merge remote-tracking branch 'qatar/master' 2012-09-07 13:50:24 +02:00
mss34dsp.c
mss34dsp.h
msvideo1.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
msvideo1enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mxpegdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nellymoser.c
nellymoser.h
nellymoserdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
nellymoserenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
noise_bsf.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
nuv.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
old_codec_ids.h add OTF support for attachments 2012-09-10 17:08:18 +02:00
options_table.h ratecontrol: Dynamically choose a default for rc_max_available_vbv_use 2012-09-11 17:50:14 +02:00
options.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
os2threads.h
paf.c paf: avoid using expressions with sideeffects in AV_R* 2012-09-04 21:25:39 +02:00
paf.h
pamenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
parser.c parser: Don't use pc as context for av_dlog 2012-09-05 16:01:40 +03:00
parser.h
pcm_tablegen.c
pcm_tablegen.h
pcm-mpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcx.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pcxenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pgssubdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
pictordec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
png_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
png.c
png.h
pngdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pngdsp.c
pngdsp.h
pngenc.c lavc/pngenc: Enable frame threading for PNG encodes 2012-09-10 15:15:40 +02:00
pnm_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pnm.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
pnm.h
pnmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
pnmenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
proresdata.c
proresdata.h
proresdec2.c proresdec2: avoid VLA and use SliceContext instead. 2012-09-07 19:38:23 +02:00
proresdec_lgpl.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
proresdec.h proresdec2: avoid VLA and use SliceContext instead. 2012-09-07 19:38:23 +02:00
proresdsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
proresdsp.h
proresenc_anatoliy.c proresenc_anatoliy: add 2 const to silence 2 warnings 2012-09-05 20:54:50 +02:00
proresenc_kostya.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
psymodel.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
psymodel.h aacenc: new default cutoff 2012-07-29 22:02:46 +02:00
pthread.c Merge remote-tracking branch 'qatar/master' 2012-08-19 14:55:58 +02:00
ptx.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
put_bits.h Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
qcelpdata.h
qcelpdec.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
qdm2_tablegen.c
qdm2_tablegen.h
qdm2.c Merge remote-tracking branch 'qatar/master' 2012-08-10 04:46:13 +02:00
qdm2data.h
qdrw.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
qpeg.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
qtrle.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
qtrleenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
r210dec.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
r210enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ra144.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
ra144.h
ra144dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ra144enc.c ra144enc: avoid integer overflows. 2012-09-10 21:04:01 +02:00
ra288.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
ra288.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
ralf.c Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
ralfdata.h
rangecoder.c
rangecoder.h
ratecontrol.c ratecontrol: change a commented printf to av_log 2012-09-11 17:50:14 +02:00
ratecontrol.h
raw.c lavc/raw-test: invert the order of key/value when printing the fourcc->pix_fmt map 2012-09-06 23:39:57 +02:00
raw.h
rawdec.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
rawenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rdft.c
rdft.h
realtextdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rectangle.h
remove_extradata_bsf.c
resample2.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
resample.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rl2.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rl.h
rle.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rle.h
roqaudioenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
roqvideo.c
roqvideo.h
roqvideodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
roqvideoenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rpza.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rtjpeg.c
rtjpeg.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rv10.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rv10enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rv20enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rv30.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rv30data.h
rv30dsp.c
rv34_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rv34.c lavc: add missing new line to some messages 2012-09-01 15:59:30 +02:00
rv34.h
rv34data.h
rv34dsp.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
rv34dsp.h
rv34vlc.h
rv40.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
rv40data.h
rv40dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rv40vlc2.h
s3tc.c
s3tc.h
s302m.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
samidec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sanm_data.h
sanm.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sbr.h
sbrdsp.c
sbrdsp.h
sgi.h
sgidec.c sgidec: fix error free end detection. 2012-08-12 05:32:07 +02:00
sgienc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
shorten.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
simple_idct_template.c
simple_idct.c
simple_idct.h
sinewin_tablegen.c
sinewin_tablegen.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
sinewin.c
sinewin.h
sipr16k.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
sipr16kdata.h
sipr.c Merge remote-tracking branch 'qatar/master' 2012-08-28 16:28:48 +02:00
sipr.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
siprdata.h
smacker.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
smc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
snow.c
snow.h snowdec: add 2 av_asserts to check run validity 2012-08-16 01:35:10 +02:00
snowdata.h
snowdec.c snowdec: remove unused variable 2012-09-03 01:26:57 +02:00
snowenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
sonic.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sp5x.h
sp5xdec.c sp5xdec: fix off by 1 error causing a crash 2012-08-16 03:15:14 +02:00
srtdec.c srtdec: fix unsafe snprintf() return usage 2012-09-09 14:19:02 +02:00
srtenc.c srtenc: Add timing-less "subrip" encoder. 2012-08-15 20:46:54 -07:00
subviewerdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sunrast.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
sunrast.h
sunrastenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
svq1_cb.h
svq1_vlc.h
svq1.c
svq1.h
svq1dec.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
svq1enc_cb.h
svq1enc.c svq1enc: Set picture_structure correctly 2012-09-04 18:38:02 +03:00
svq3.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
svq13.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
synth_filter.c
synth_filter.h
tableprint.h
targa.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
targa.h
targaenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
thread.h
tiertexseqv.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tiff_data.c lavc/tiff: add GeoTIFF support to the TIFF decoder 2012-07-14 13:02:38 +02:00
tiff_data.h lavc/tiff: add GeoTIFF support to the TIFF decoder 2012-07-14 13:02:38 +02:00
tiff.c Support decoding of monochrome tiff images without bpp tag. 2012-09-12 13:33:57 +02:00
tiff.h Write TIFF Tag ExtraSamples when encoding pix_fmts that contain transparency information. 2012-08-31 11:15:07 +02:00
tiffenc.c Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 2012-09-05 14:33:32 +02:00
timecode.c
timecode.h
tmv.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
truemotion1.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
truemotion1data.h
truemotion2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
truespeech_data.h
truespeech.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
tscc2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
tscc2data.h Merge remote-tracking branch 'qatar/master' 2012-07-11 23:57:11 +02:00
tscc.c lavc/tscc: use reget_buffer. 2012-08-18 09:52:15 +02:00
tta.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
twinvq_data.h
twinvq.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
ulti_cb.h
ulti.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
unary.h
utils.c lavc: protect calls to frame_thread_encoder by HAVE_THREADS 2012-08-29 11:36:56 +02:00
utvideo.c Merge remote-tracking branch 'qatar/master' 2012-08-20 17:31:55 +02:00
utvideo.h utvideoenc: Switch to dsputils' median prediction 2012-08-30 11:59:19 -04:00
utvideodec.c Merge remote-tracking branch 'qatar/master' 2012-08-24 15:00:39 +02:00
utvideoenc.c Merge remote-tracking branch 'qatar/master' 2012-09-12 11:46:47 +02:00
v210dec.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
v210dec.h
v210enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
v210x.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
v308dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
v308enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
v408dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
v408enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
v410dec.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
v410enc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vaapi_h264.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vaapi_internal.h
vaapi_mpeg2.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vaapi_mpeg4.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vaapi_vc1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vaapi.c
vaapi.h
vb.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vble.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vc1_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vc1.c vc1dec: export adv profile color format indication 2012-09-12 21:12:18 +02:00
vc1.h vc1dec: export adv profile color format indication 2012-09-12 21:12:18 +02:00
vc1acdata.h
vc1data.c
vc1data.h
vc1dec.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
vc1dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vc1dsp.h
vcr1.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vda_h264_dec.c vdadec: implement vda decoder 2012-08-28 04:07:53 +02:00
vda_h264.c vda: better frame allocation. 2012-08-14 21:22:20 +02:00
vda.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
vdpau_internal.h
vdpau.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vdpau.h
version.h Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
vima.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vmdav.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vmnc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vorbis_data.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vorbis_enc_data.h
vorbis_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vorbis_parser.h
vorbis.c
vorbis.h
vorbisdec.c Merge remote-tracking branch 'qatar/master' 2012-08-19 14:55:58 +02:00
vorbisenc.c Merge remote-tracking branch 'qatar/master' 2012-08-23 14:33:33 +02:00
vp3_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp3.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp3data.h
vp3dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vp3dsp.h Merge remote-tracking branch 'qatar/master' 2012-07-18 22:34:48 +02:00
vp5.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp5data.h
vp6.c lavc/vp6: Disable deblock filtering for Simple Profile 2012-09-07 01:36:21 +02:00
vp6data.h
vp6dsp.c
vp8_parser.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp8.c Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
vp8.h Merge remote-tracking branch 'qatar/master' 2012-08-02 23:34:01 +02:00
vp8data.h
vp8dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vp8dsp.h
vp56.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp56.h vp56: Don't use DECLARE_ALIGN on a typedef name 2012-08-28 15:04:16 +02:00
vp56data.c
vp56data.h
vp56dsp.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vp56dsp.h Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp56rac.c
vqavideo.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
w32pthreads.h Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
wavpack.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wma_common.c
wma_common.h
wma.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wma.h
wmadata.h
wmadec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wmaenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wmalosslessdec.c wmalosslessdec: remove unused variable 2012-08-30 11:11:31 +02:00
wmaprodata.h
wmaprodec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wmavoice_data.h
wmavoice.c wmavoice: switch to av_assert 2012-08-30 02:34:00 +02:00
wmv2.c
wmv2.h
wmv2dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wmv2enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
wnv1.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
ws-snd1.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
xan.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xbmdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xbmenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
xiph.c
xiph.h
xl.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
xsubdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xsubenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xvmc_internal.h
xvmc.h
xwd.h
xwddec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xwdenc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
xxan.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
y41pdec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
y41penc.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
yuv4dec.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
yuv4enc.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
zerocodec.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
zmbv.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
zmbvenc.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00