ffmpeg/libavcodec
Michael Niedermayer 52cea9ce92 Merge commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf' into release/0.10
* commit '01a4e7f623a2e6dc95862f9a56c777f058d7bfaf':
  lavf: Bump minor version to distinguish branch and master version numbers
  vp6: properly fail on unsupported feature
  mp3: properly forward mp_decode_frame errors
  mpeg12: do not decode extradata more than once.
  indeo3: when freeing buffers, set pointers referencing them to NULL as well
  indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
  avconv: fix copying per-stream metadata.
  id3v2: fix reading unsynchronized frames.
  h264: Fix parameters to ff_er_add_slice() call
  build: fix 'clean' target

Conflicts:
	avconv.c
	libavcodec/mpeg12.h
	libavformat/id3v2.c
	libavformat/version.h

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