ffmpeg/libavformat
Michael Niedermayer 7d82020fcb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  librtmp: return AVERROR_UNKNOWN instead of -1.
  librtmp: don't abuse a variable for two unrelated things.
  librtmp: add rtmp_app and rtmp_playpath private options.
  bmv: add stricter checks for invalid decoded length
  avpacket: fix duplicating side data.
  flv: support stream text data as onTextData

Conflicts:
	libavcodec/bmv.c
	libavformat/flvdec.c
	libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-04 00:33:42 +02:00
..
2012-05-21 08:51:50 +02:00
2012-05-31 00:46:47 +02:00
2011-12-19 11:57:34 +01:00
2012-03-03 04:30:49 +01:00
2012-05-10 04:17:03 +02:00
2011-12-30 20:00:53 +01:00
2012-05-31 23:50:08 +02:00
2012-05-07 02:42:00 +02:00
2012-05-20 16:29:08 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-05-26 00:18:15 +02:00
2012-05-21 08:51:50 +02:00
2012-03-31 12:37:42 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-05-31 16:55:37 +02:00
2012-05-08 10:37:13 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00