• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 967bdb85
    Michael Niedermayer authored
    * qatar/master:
      resample: allocate a large enough output buffer
      fate: fix enc_dec_pcm tests with remote target
      wmaenc: remove bit-exact hack
      FATE: remove WMA acodec tests
      FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison
      FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison
      qtrle: Use bytestream2 functions to prevent buffer overreads.
      vqavideo: check malloc return values
      x11grab: fix a memory leak exposed by valgrind
      threads: fix old frames returned after avcodec_flush_buffers()
      MPV: always mark dummy frames as reference
      h264: fix deadlocks on incomplete reference frame decoding.
      mpeg4: report frame decoding completion at ff_MPV_frame_end().
      mimic: don't use self as reference, and report completion at end of decode().
    
    Conflicts:
    	libavcodec/h264.c
    	libavcodec/qtrle.c
    	libavcodec/resample.c
    	libavcodec/vqavideo.c
    	libavdevice/x11grab.c
    	tests/ref/seek/wmav1_asf
    	tests/ref/seek/wmav2_asf
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    967bdb85
Name
Last commit
Last update
..
ac3_ac3 Loading commit data...
adpcm_ima_wav Loading commit data...
adpcm_ms_wav Loading commit data...
adpcm_qt_aiff Loading commit data...
adpcm_swf_flv Loading commit data...
adpcm_yam_wav Loading commit data...
alac_m4a Loading commit data...
asv1_avi Loading commit data...
asv2_avi Loading commit data...
dnxhd_1080i_mov Loading commit data...
dnxhd_720p_dnxhd Loading commit data...
dnxhd_720p_rd_dnxhd Loading commit data...
dv411_dv Loading commit data...
dv50_dv Loading commit data...
dv_dv Loading commit data...
error_mpeg4_adv_avi Loading commit data...
ffv1_avi Loading commit data...
flac_flac Loading commit data...
flashsv_flv Loading commit data...
flv_flv Loading commit data...
g726_wav Loading commit data...
h261_avi Loading commit data...
h263_avi Loading commit data...
h263p_avi Loading commit data...
huffyuv_avi Loading commit data...
image_bmp Loading commit data...
image_jpg Loading commit data...
image_pcx Loading commit data...
image_pgm Loading commit data...
image_ppm Loading commit data...
image_sgi Loading commit data...
image_tga Loading commit data...
image_tiff Loading commit data...
jpegls_avi Loading commit data...
lavf_aif Loading commit data...
lavf_al Loading commit data...
lavf_asf Loading commit data...
lavf_au Loading commit data...
lavf_avi Loading commit data...
lavf_dv Loading commit data...
lavf_ffm Loading commit data...
lavf_flv Loading commit data...
lavf_gif Loading commit data...
lavf_gxf Loading commit data...
lavf_mkv Loading commit data...
lavf_mmf Loading commit data...
lavf_mov Loading commit data...
lavf_mpg Loading commit data...
lavf_mxf Loading commit data...
lavf_mxf_d10 Loading commit data...
lavf_nut Loading commit data...
lavf_ogg Loading commit data...
lavf_rm Loading commit data...
lavf_swf Loading commit data...
lavf_ts Loading commit data...
lavf_ul Loading commit data...
lavf_voc Loading commit data...
lavf_wav Loading commit data...
lavf_wtv Loading commit data...
lavf_y4m Loading commit data...
ljpeg_avi Loading commit data...
mjpeg_avi Loading commit data...
mp2_mp2 Loading commit data...
mpeg1_mpg Loading commit data...
mpeg1b_mpg Loading commit data...
mpeg2_422_mpg Loading commit data...
mpeg2_idct_int_mpg Loading commit data...
mpeg2i_mpg Loading commit data...
mpeg2ivlc_qprd_mpg Loading commit data...
mpeg2reuse_mpg Loading commit data...
mpeg2thread_mpg Loading commit data...
mpeg2threadivlc_mpg Loading commit data...
mpeg4_Q_avi Loading commit data...
mpeg4_adap_avi Loading commit data...
mpeg4_adv_avi Loading commit data...
mpeg4_nr_avi Loading commit data...
mpeg4_qprd_avi Loading commit data...
mpeg4_rc_avi Loading commit data...
mpeg4_thread_avi Loading commit data...
msmpeg4_avi Loading commit data...
msmpeg4v2_avi Loading commit data...
odivx_mp4 Loading commit data...
pbmpipe_pbm Loading commit data...
pcm_alaw_wav Loading commit data...
pcm_f32be_au Loading commit data...
pcm_f32le_wav Loading commit data...
pcm_f64be_au Loading commit data...
pcm_f64le_wav Loading commit data...
pcm_mulaw_wav Loading commit data...
pcm_s16be_mov Loading commit data...
pcm_s16le_wav Loading commit data...
pcm_s24be_mov Loading commit data...
pcm_s24daud_302 Loading commit data...
pcm_s24le_wav Loading commit data...
pcm_s32be_mov Loading commit data...
pcm_s32le_wav Loading commit data...
pcm_s8_mov Loading commit data...
pcm_u8_wav Loading commit data...
pgmpipe_pgm Loading commit data...
ppmpipe_ppm Loading commit data...
rgb_avi Loading commit data...
roqav_roq Loading commit data...
rv10_rm Loading commit data...
rv20_rm Loading commit data...
snow53_avi Loading commit data...
snow_avi Loading commit data...
svq1_mov Loading commit data...
wmv1_avi Loading commit data...
wmv2_avi Loading commit data...
yuv_avi Loading commit data...