1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
Michael Niedermayer d5518545d1 Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'
* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
  h263: remove an unused parameter from ff_h263_decode_init_vlc
  flac: add channel layout masks for streams with 7 or 8 channels.
  flac: don't check the number of channels before setting the channel layout.

Conflicts:
	libavcodec/version.h

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