1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer ca350378de Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'
* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
	libavformat/mp3enc.c

See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23 03:34:13 +02:00
..
2014-06-18 14:55:28 +02:00
2014-06-03 10:58:19 -08:00
2014-05-17 20:13:33 +02:00
2014-06-03 10:58:19 -08:00
2014-06-18 19:49:23 +02:00
2014-05-20 00:00:45 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-05-20 00:00:45 +02:00
2014-06-03 10:58:19 -08:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-01 01:13:09 +02:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2014-03-11 13:22:49 +01:00
2014-06-03 10:58:19 -08:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2014-04-27 15:14:32 +02:00
2014-04-20 20:56:02 +02:00
2014-06-20 10:21:31 -08:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-06-07 14:43:07 +02:00
2014-04-15 13:51:48 +02:00