Michael Niedermayer
ae215e2b42
Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77' ...
* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
mp3: enable packed main_data decoding in MP4
Conflicts:
libavcodec/mpegaudiodec_template.c
Only the parts needed to support the available sample are merged
the remaining error checks are left in place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-21 20:32:06 +02:00
2015-03-05 13:41:51 +01:00
2015-05-19 13:43:18 +02:00
2015-04-12 00:15:58 +02:00
2015-03-15 22:20:15 +01:00
2015-04-13 02:08:46 +02:00
2014-12-02 03:02:30 +01:00
2015-06-20 14:26:34 +02:00
2015-05-15 03:13:49 +02:00
2015-06-17 22:47:17 +02:00
2015-04-22 19:28:07 +02:00
2015-04-03 22:48:33 +02:00
2015-05-06 21:21:00 +02:00
2015-06-21 13:43:02 +02:00
2015-05-29 09:42:35 +03:00
2015-04-02 23:15:57 +02:00
2015-06-21 17:33:46 +02:00
2014-12-10 00:58:13 +01:00
2015-04-20 05:19:03 +02:00
2014-10-04 11:21:32 +02:00
2015-06-21 20:32:06 +02:00
2015-04-06 23:00:16 +02:00
2015-01-28 05:45:32 +01:00
2015-02-15 20:25:31 +01:00
2014-09-25 13:37:40 +02:00
2015-03-24 01:24:13 +01:00
2015-04-23 12:56:31 +02:00
2015-06-07 01:24:50 -03:00
2015-04-23 04:44:45 +02:00
2015-06-09 20:09:12 +02:00
2015-05-07 07:19:49 -04:00
2014-09-02 14:41:13 -07:00
ae215e2b42