FFmpeg/libavcodec
Michael Niedermayer e2d4bcd7b8 Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'
* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-08 10:50:24 +02:00
..
2013-06-02 11:25:56 +02:00
2013-05-22 21:30:28 +02:00
2013-05-28 13:35:09 +02:00
2013-05-23 10:05:28 +00:00
2013-05-30 18:38:04 +02:00
2013-05-31 03:10:08 +02:00
2013-06-06 22:02:54 +02:00
2013-06-05 18:34:07 +02:00
2013-06-06 21:52:49 +02:00
2013-05-26 21:57:28 +00:00
2013-05-22 20:24:50 +02:00
2013-05-22 20:24:50 +02:00
2013-06-05 22:35:31 +00:00
2013-05-23 20:38:53 +00:00
2013-05-22 17:40:12 +02:00
2013-06-04 17:25:32 +00:00
2013-06-02 15:16:52 +00:00
2013-06-05 22:35:31 +00:00
2013-05-28 13:56:29 +03:00
2013-06-04 02:43:20 +02:00
2013-05-21 17:49:29 +00:00
2013-05-29 22:31:16 +02:00