• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · bb258fb9
    Michael Niedermayer authored
    * qatar/master:
      doc: Improve references to external URLs.
      h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
      ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
      dnxhdenc: Replace a forward declaration by the proper #include.
      h264: move h264_mvpred.h include.
      pix_fmt: Fix number of bits per component in yuv444p9be
      lavf: deprecate AVFormatContext.timestamp
      ffmpeg: merge input_files_ts_scale into InputStream.
      ffmpeg: don't abuse a global for passing sample format from input to output
      ffmpeg: don't abuse a global for passing channel layout from input to output
      ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
      matroskaenc: make SSA default subtitle codec.
      oggdec: prevent heap corruption.
    
    Conflicts:
    	doc/developer.texi
    	doc/faq.texi
    	doc/general.texi
    	ffmpeg.c
    	ffplay.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bb258fb9
dnxhdenc.c 29.8 KB