1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libswscale
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
..
bfin swscale: fix compilation of bfin due to missing pixdesc.h header 2011-06-01 13:30:35 +02:00
mlib
ppc Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-06-10 04:47:23 +02:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
libswscale.v
Makefile swscale: split swscale.c in unscaled and generic conversion routines. 2011-06-03 09:52:09 -07:00
options.c Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
rgb2rgb.h Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
swscale-test.c swscale: Remove commented-out printf cruft. 2011-05-28 11:09:30 +02:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
swscale.h swscale: reintroduce sws_format_name() symbol 2011-06-03 00:41:14 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
yuv2rgb.c swscale: remove sws_format_name() 2011-05-30 09:07:43 +02:00