• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0e7fc3ca
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      rv34: frame-level multi-threading
      mpegvideo: claim ownership of referenced pictures
      aacsbr: prevent out of bounds memcpy().
      ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
      sierravmd: fix audio pts
      bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
      bmpenc: support for PIX_FMT_RGB444
      swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
      swscale: specify register type.
      rv34: use get_bits_left()
      avconv: reinitialize the filtergraph on resolution change.
      vsrc_buffer: error on changing frame parameters.
      avconv: fix -copyinkf.
      fate: Update file checksums after the mov muxer change in a78dbada
      movenc: Don't store a nonzero creation time if nothing was set by the caller
      bmpdec: support for rgb444 with bitfields compression
      rgb2rgb: allow conversion for <15 bpp
      doc: fix stray reference to FFmpeg
      v4l2: use C99 struct initializer
      v4l2: poll the file descriptor
      ...
    
    Conflicts:
    	avconv.c
    	libavcodec/aacsbr.c
    	libavcodec/bethsoftvideo.c
    	libavcodec/kmvc.c
    	libavdevice/v4l2.c
    	libavfilter/vsrc_buffer.c
    	libswscale/swscale_unscaled.c
    	libswscale/x86/input.asm
    	tests/ref/acodec/alac
    	tests/ref/acodec/pcm_s16be
    	tests/ref/acodec/pcm_s24be
    	tests/ref/acodec/pcm_s32be
    	tests/ref/acodec/pcm_s8
    	tests/ref/lavf/mov
    	tests/ref/vsynth1/dnxhd_1080i
    	tests/ref/vsynth1/mpeg4
    	tests/ref/vsynth1/qtrle
    	tests/ref/vsynth1/svq1
    	tests/ref/vsynth2/dnxhd_1080i
    	tests/ref/vsynth2/mpeg4
    	tests/ref/vsynth2/qtrle
    	tests/ref/vsynth2/svq1
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0e7fc3ca
Name
Last commit
Last update
..
amv Loading commit data...
asv1 Loading commit data...
asv2 Loading commit data...
cljr Loading commit data...
dnxhd_1080i Loading commit data...
dnxhd_720p Loading commit data...
dnxhd_720p_10bit Loading commit data...
dnxhd_720p_rd Loading commit data...
dv Loading commit data...
dv50 Loading commit data...
dv_411 Loading commit data...
error Loading commit data...
ffv1 Loading commit data...
flashsv Loading commit data...
flashsv2 Loading commit data...
flv Loading commit data...
h261 Loading commit data...
h263 Loading commit data...
h263p Loading commit data...
huffyuv Loading commit data...
jpeg2000 Loading commit data...
jpegls Loading commit data...
ljpeg Loading commit data...
mjpeg Loading commit data...
mpeg Loading commit data...
mpeg1b Loading commit data...
mpeg2 Loading commit data...
mpeg2_422 Loading commit data...
mpeg2_idct_int Loading commit data...
mpeg2_ilace Loading commit data...
mpeg2_ivlc_qprd Loading commit data...
mpeg2thread Loading commit data...
mpeg2thread_ilace Loading commit data...
mpeg4 Loading commit data...
mpeg4_adap Loading commit data...
mpeg4_qpel Loading commit data...
mpeg4_qprd Loading commit data...
mpeg4adv Loading commit data...
mpeg4nr Loading commit data...
mpeg4thread Loading commit data...
mpng Loading commit data...
msmpeg4 Loading commit data...
msmpeg4v2 Loading commit data...
msvideo1 Loading commit data...
prores Loading commit data...
qtrle Loading commit data...
qtrlegray Loading commit data...
rc Loading commit data...
rgb Loading commit data...
roq Loading commit data...
rv10 Loading commit data...
rv20 Loading commit data...
snow Loading commit data...
snowll Loading commit data...
svq1 Loading commit data...
v210 Loading commit data...
vref Loading commit data...
wmv1 Loading commit data...
wmv2 Loading commit data...
yuv Loading commit data...
zlib Loading commit data...
zmbv Loading commit data...