1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
Michael Niedermayer e7389ed5d0 Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
..
2013-03-17 04:38:28 +01:00
2013-01-22 20:27:05 +01:00
2013-02-22 13:52:43 +00:00
2013-03-20 20:59:24 +01:00
2013-01-24 15:02:44 +00:00
2013-01-24 15:02:44 +00:00
2013-03-29 05:01:38 +01:00
2013-03-22 14:57:27 +01:00
2013-01-25 00:04:22 +01:00
2013-01-17 04:55:14 +01:00
2013-02-21 22:24:26 +01:00
2013-02-21 00:59:32 +01:00
2013-03-08 07:32:11 +01:00
2013-03-24 23:19:07 +01:00
2013-04-04 04:04:24 +02:00
2013-03-31 16:10:52 +02:00
2013-03-16 13:42:53 +01:00
2013-03-18 00:08:59 +01:00
2013-03-18 23:57:44 +01:00
2013-04-03 13:01:38 +00:00
2013-02-13 17:36:55 +00:00
2013-01-20 20:59:30 +01:00