1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavformat
Michael Niedermayer 2b6325cacb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
  h264: Make ff_h264_decode_end() static, it is not used externally.
  output-example: K&R formatting cosmetics, comment spelling fixes
  avf: make the example output the proper message
  avf: fix audio writing in the output-example
  mov: don't overwrite existing indexes.
  lzw: fix potential integer overflow.
  truemotion: forbid invalid VLC bitsizes and token values.
  truemotion2: handle out-of-frame motion vectors through edge extension.
  configure: Check for a different SDL function

Conflicts:
	configure
	doc/examples/muxing.c
	libavcodec/truemotion2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-30 22:10:17 +02:00
..
2012-02-06 20:33:06 +01:00
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-03-13 01:14:04 +01:00
2012-03-03 04:30:49 +01:00
2011-12-30 20:00:53 +01:00
2012-03-30 05:16:15 +02:00
2012-03-26 20:03:56 +02:00
2012-03-23 01:27:49 +01:00
2012-03-10 18:01:03 +01:00
2012-03-26 15:05:02 +02:00
2012-02-02 14:31:17 +01:00
2012-03-13 01:14:04 +01:00
2011-12-20 22:38:53 +01:00
2012-03-27 12:52:53 +02:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-03-28 02:34:06 +02:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2011-12-30 20:00:53 +01:00
2012-03-23 10:31:45 +01:00