1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer 175cc378b3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  movenc: Rudimentary IODs support.
  v410enc: fix output buffer size check
  v410enc: include correct headers
  fate: add -pix_fmt rgb48le to r210 test
  flvenc: Support muxing 16 kHz nellymoser
  configure: refactor list of programs into a variable
  fate: add r210 decoder test
  fate: split off Indeo FATE tests into their own file
  fate: split off ATRAC FATE tests into their own file
  fate: Add FATE tests for v410 encoder and decoder
  ARM: fix external symbol refs in rv40 asm
  westwood: Make sure audio header info is present when parsing audio packets
  libgsm: Reset the MS mode of GSM in the flush function
  libgsm: Set options on the right object
  ARM: dca: disable optimised decode_blockcodes() for old gcc

Conflicts:
	configure
	libavformat/movenc.c
	libavformat/movenc.h
	tests/fate2.mak
	tests/ref/acodec/alac
	tests/ref/vsynth1/mpeg4
	tests/ref/vsynth2/mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 01:23:15 +01:00
..
2011-12-13 23:07:40 +01:00
2011-11-27 21:19:07 +01:00
2011-12-15 03:59:29 +01:00
2011-12-14 00:39:58 +01:00
2011-11-25 13:19:54 +00:00
2011-12-15 18:38:04 +01:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01:00
2011-12-15 19:23:07 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-14 18:14:20 +01:00
2011-11-05 00:02:31 +01:00
2011-12-11 00:32:25 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-11-09 23:10:07 +01:00
2011-12-11 00:32:25 +01:00
2011-10-10 02:58:18 +02:00
2011-12-03 03:00:49 +01:00
2011-09-24 21:11:01 +02:00
2011-12-03 03:00:44 +01:00
2011-09-25 21:16:55 +02:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-15 02:43:03 +01:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-10-21 02:27:33 +02:00
2011-11-24 15:39:41 +01:00
2011-12-15 18:38:04 +01:00
2011-12-13 15:46:23 +01:00
2011-12-05 03:22:06 +01:00
2011-11-11 18:40:19 +01:00
2011-12-13 21:08:43 +01:00
2011-11-12 20:15:21 +01:00
2011-12-13 20:01:49 +01:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-12-13 21:08:43 +01:00
2011-11-12 20:17:56 +01:00
2011-12-02 03:23:07 +01:00
2011-12-13 19:54:31 +01:00
2011-12-16 01:04:43 +01:00
2011-10-19 20:26:55 +02:00
2011-12-14 03:38:57 +01:00
2011-12-01 18:46:22 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-12-15 18:38:04 +01:00
2011-11-12 20:49:53 +01:00