• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 45fb6474
    Michael Niedermayer authored
    * qatar/master:
      bitstream: Properly promote av_reverse values before shifting.
      libavutil/swscale: YUV444P10/YUV444P9 support.
      H.264: Fix high bit depth explicit biweight
      h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
      Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
      Update copyright year for ac3enc_opts_template.c.
      adts: Adjust frame size mask to follow the specification.
      movenc: Add RTP muxer/hinter options
      movenc: Pass the RTP AVFormatContext to the SDP generation
      rtspenc: Add RTP muxer options
      rtspenc: Add an AVClass for setting muxer specific options
      rtpenc_chain: Pass the rtpflags options through to the chained muxer
      rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
      sdp: Reindent after the previous commit
      rtpenc: MP4A-LATM payload support
      avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
      sdp: Allow passing an AVFormatContext to the SDP generation
      mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
      mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
      swscale: split YUYV output out of yuv2packed[12X]_c().
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/Makefile
    	libavcodec/h264dsp_template.c
    	libavcodec/mpeg12.c
    	libavformat/aacdec.c
    	libavformat/avidec.c
    	libavformat/internal.h
    	libavformat/movenc.c
    	libavformat/rtpenc.c
    	libavformat/rtpenc_latm.c
    	libavformat/sdp.c
    	libavformat/version.h
    	libavutil/avutil.h
    	libavutil/pixfmt.h
    	libswscale/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    45fb6474
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_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...
timer.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...