1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 23:33:07 +00:00
ffmpeg/libavutil
Michael Niedermayer 45fb647495 Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2011-06-11 03:51:36 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2011-05-31 02:08:20 +02:00
avr32
bfin
mips
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4
tomi
x86
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audioconvert.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
audioconvert.h
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c
avstring.h
avutil.h avoptions: Add an av_opt_flag_is_set function for inspecting flag fields 2011-06-10 10:47:42 +03:00
base64.c
base64.h
bswap.h bswap.h: Remove disabled code. 2011-04-29 20:01:04 +02:00
colorspace.h
common.h Merge remote branch 'qatar/master' 2011-05-14 02:19:58 +02:00
cpu.c cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
cpu.h cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
crc_data.h
crc.c
crc.h
des.c
des.h
dict.c dict: This code was developed in ffmpeg and not libav, nor by libav developers. 2011-06-10 00:19:25 +02:00
dict.h dict: This code was developed in ffmpeg and not libav, nor by libav developers. 2011-06-10 00:19:25 +02:00
error.c error.c: fix compile flags 2011-05-30 03:11:54 +02:00
error.h
eval.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
eval.h
fifo.c fifo: use av_freep() 2011-05-09 21:23:45 +02:00
fifo.h
file.c Fix error check in av_file_map() 2011-06-04 17:03:25 +01:00
file.h
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
integer.c
integer.h
internal.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
log.h Check syntax even if DEBUG is not defined. 2011-05-11 12:26:25 +02:00
lzo.c
lzo.h
Makefile Move metadata API from lavf to lavu. 2011-06-08 07:43:45 +02:00
mathematics.c av_compare_ts: Improve speed when calculations fit in 64bit. 2011-05-11 20:41:19 +02:00
mathematics.h
md5.c
md5.h
mem.c mem: Trying to workaround posix_memalign() bug on OSX 2011-06-07 03:17:42 +02:00
mem.h Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
opt.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
opt.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
pca.c
pca.h
pixdesc.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
pixdesc.h pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
pixfmt.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sha.c
sha.h
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
timer.h
tree.c
tree.h
utils.c
x86_cpu.h