1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
Michael Niedermayer 2d37c57f3e Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  mp3: Properly use AVCodecContext API

Conflicts:
	libavformat/mp3dec.c

See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 20:21:16 +01:00
..
2015-03-06 21:35:00 +01:00
2015-02-26 02:06:10 +01:00
2015-03-05 23:08:38 +01:00
2015-03-04 23:48:41 +01:00
2015-01-30 09:33:49 +00:00
2015-02-17 12:16:43 -05:00
2015-02-15 18:20:54 +01:00
2015-03-08 02:35:04 +00:00
2015-02-21 23:37:24 +02:00
2015-01-18 00:36:56 +01:00
2015-02-01 20:00:10 +01:00
2015-03-05 00:09:26 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00