FFmpeg/libavformat
Michael Niedermayer 72eddc10fa Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
  lavf: Reset the entry count and allocation size variables on av_reallocp failures

Conflicts:
	libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27 12:13:41 +02:00
..
2013-09-19 22:04:34 +02:00
2013-08-29 01:57:38 +02:00
2013-09-03 19:34:04 +02:00
2013-09-18 14:10:05 -04:00
2013-09-21 15:36:33 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 03:26:54 +02:00
2013-09-21 15:36:33 +02:00
2013-09-08 12:54:49 +02:00
2013-08-09 23:02:48 +02:00
2013-09-21 15:36:33 +02:00
2013-08-23 20:05:35 +02:00
2013-09-15 22:03:03 -04:00
2013-09-21 15:36:33 +02:00
2013-08-05 10:14:42 +02:00
2013-08-21 05:51:41 +02:00
2013-09-21 15:36:33 +02:00