• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 184fc600
    Michael Niedermayer authored
    * qatar/master:
      mpegvideo_enc: only allocate output packet when we know there will be output
      Add names for more channel layouts to the channel layout map.
      sunrast: Add a sample request for RMP_RAW colormap.
      avcodec: do not override pts or duration from the audio encoder
      Add prores regression test.
      Enable already existing rso regression test.
      Add regression test for "sox" format muxer/demuxer.
      Add dpx encoding regression test.
      swscale: K&R formatting cosmetics for PowerPC code (part I/II)
      img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
      Clarify licensing information about files borrowed from libjpeg.
      Mark mutable static data const where appropriate.
      avplay: fix -threads option
      dvbsubdec: avoid undefined signed left shift in RGBA macro
      mlpdec: use av_log_ask_for_sample()
      gif: K&R formatting cosmetics
      png: make .long_name more descriptive
      movdec: Adjust keyframe flagging in fragmented files
      rv34: change most "int stride" into "ptrdiff_t stride".
    
    Conflicts:
    	avprobe.c
    	ffplay.c
    	libavcodec/mlpdec.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/pngenc.c
    	libavcodec/x86/v210-init.c
    	libavfilter/vf_boxblur.c
    	libavfilter/vf_crop.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_lut.c
    	libavfilter/vf_overlay.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavfilter/vf_select.c
    	libavfilter/vf_setpts.c
    	libavfilter/vf_settb.c
    	libavformat/img2.c
    	libavutil/audioconvert.c
    	tests/codec-regression.sh
    	tests/lavf-regression.sh
    	tests/ref/lavf/dpx
    	tests/ref/vsynth1/prores
    	tests/ref/vsynth2/prores
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    184fc600
Name
Last commit
Last update
..
arm Loading commit data...
avr32 Loading commit data...
bfin Loading commit data...
mips Loading commit data...
ppc Loading commit data...
sh4 Loading commit data...
tomi Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
adler32.c Loading commit data...
adler32.h Loading commit data...
aes.c Loading commit data...
aes.h Loading commit data...
attributes.h Loading commit data...
audioconvert.c Loading commit data...
audioconvert.h Loading commit data...
avassert.h Loading commit data...
avstring.c Loading commit data...
avstring.h Loading commit data...
avutil.h Loading commit data...
base64.c Loading commit data...
base64.h Loading commit data...
bswap.h Loading commit data...
colorspace.h Loading commit data...
common.h Loading commit data...
cpu.c Loading commit data...
cpu.h Loading commit data...
crc.c Loading commit data...
crc.h Loading commit data...
crc_data.h Loading commit data...
des.c Loading commit data...
des.h Loading commit data...
dict.c Loading commit data...
dict.h Loading commit data...
error.c Loading commit data...
error.h Loading commit data...
eval.c Loading commit data...
eval.h Loading commit data...
fifo.c Loading commit data...
fifo.h Loading commit data...
file.c Loading commit data...
file.h Loading commit data...
imgutils.c Loading commit data...
imgutils.h Loading commit data...
integer.c Loading commit data...
integer.h Loading commit data...
internal.h Loading commit data...
intfloat.h Loading commit data...
intfloat_readwrite.c Loading commit data...
intfloat_readwrite.h Loading commit data...
intmath.h Loading commit data...
intreadwrite.h Loading commit data...
inverse.c Loading commit data...
lfg.c Loading commit data...
lfg.h Loading commit data...
libavutil.v Loading commit data...
libm.h Loading commit data...
lls.c Loading commit data...
lls.h Loading commit data...
log.c Loading commit data...
log.h Loading commit data...
lzo.c Loading commit data...
lzo.h Loading commit data...
mathematics.c Loading commit data...
mathematics.h Loading commit data...
md5.c Loading commit data...
md5.h Loading commit data...
mem.c Loading commit data...
mem.h Loading commit data...
opt.c Loading commit data...
opt.h Loading commit data...
parseutils.c Loading commit data...
parseutils.h Loading commit data...
pca.c Loading commit data...
pca.h Loading commit data...
pixdesc.c Loading commit data...
pixdesc.h Loading commit data...
pixfmt.h Loading commit data...
random_seed.c Loading commit data...
random_seed.h Loading commit data...
rational.c Loading commit data...
rational.h Loading commit data...
rc4.c Loading commit data...
rc4.h Loading commit data...
samplefmt.c Loading commit data...
samplefmt.h Loading commit data...
sha.c Loading commit data...
sha.h Loading commit data...
softfloat.c Loading commit data...
softfloat.h Loading commit data...
timecode.c Loading commit data...
timecode.h Loading commit data...
timer.h Loading commit data...
timestamp.h Loading commit data...
tree.c Loading commit data...
tree.h Loading commit data...
utils.c Loading commit data...
x86_cpu.h Loading commit data...