1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer 20f5a17956 Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'
* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
  rtpdec_mpeg4: reassemble fragmented AAC frames

Conflicts:
	libavformat/rtpdec_mpeg4.c

See: fee2cc39becb1930461dff267389717337804a4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 01:59:44 +01:00
..
2014-12-18 00:10:35 +01:00
2015-02-16 19:59:04 +01:00
2015-01-15 17:09:39 +01:00
2015-01-30 09:33:49 +00:00
2015-02-17 12:16:43 -05:00
2015-02-06 20:44:36 +01:00
2014-12-18 23:27:07 +01:00
2015-02-15 18:20:54 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2015-02-21 23:37:24 +02:00
2015-02-21 23:37:24 +02:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00