ffmpeg/libavformat
Michael Niedermayer bb258fb995 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>
2011-07-13 00:42:11 +02:00
..
2011-05-15 03:25:57 +02:00
2011-04-17 23:43:54 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-05-05 03:30:24 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-04-17 23:43:54 +02:00
2011-04-07 03:32:26 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-06-02 20:06:00 +01:00
2011-07-06 10:05:08 +02:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-04-20 04:48:23 +02:00
2011-04-02 01:54:27 +02:00
2011-06-02 20:06:00 +01:00
2011-05-30 02:39:26 +02:00
2011-04-04 02:15:12 +02:00
2011-05-01 21:13:18 +02:00
2011-06-02 20:06:00 +01:00