• 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
rtpenc.h 3.03 KB