Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Jul 2011 22:42:11 +0000 (00:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Jul 2011 22:42:11 +0000 (00:42 +0200)
commitbb258fb995a42112d1fe14f53ec599b2cd19b707
treed7152f06fcff2c66509c57a5dd906ca225069ae1
parent896e59758a11ff645879098b5ebca2e753731b4e
parent2cb6dec61c8e6676105de628ba20a5b3d162976e
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
19 files changed:
doc/developer.texi
doc/faq.texi
doc/ffmpeg.texi
doc/general.texi
doc/protocols.texi
ffmpeg.c
ffplay.c
libavcodec/dnxhdenc.c
libavcodec/h264.h
libavcodec/h264_mvpred.h
libavformat/avformat.h
libavformat/dvenc.c
libavformat/gxfenc.c
libavformat/matroskaenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggdec.c
libavformat/version.h
libavutil/pixdesc.c