ffmpeg/libavcodec
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-04-22 22:26:55 +02:00
2012-06-01 02:32:00 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-06-03 01:53:36 +02:00
2012-05-20 16:29:07 +02:00
2012-05-08 00:25:25 +02:00
2012-05-28 18:20:39 +02:00
2012-06-02 19:56:10 +02:00
2012-04-21 19:28:35 +02:00
2012-05-08 23:18:48 +02:00
2012-05-07 18:55:44 +02:00
2012-05-11 03:33:59 +02:00
2012-05-18 23:34:11 +02:00
2012-05-25 13:40:12 +02:00
2012-05-08 22:04:01 +02:00
2012-05-25 13:40:12 +02:00
2012-05-25 13:40:12 +02:00
2012-05-31 20:25:23 +02:00
2012-05-30 07:50:32 +00:00
2012-05-08 08:39:37 +02:00
2012-05-31 05:07:51 +02:00
2012-05-25 13:40:12 +02:00
2012-05-18 23:34:11 +02:00
2012-04-22 22:26:55 +02:00
2012-05-28 17:24:13 +02:00
2012-05-09 11:58:08 +02:00
2012-05-18 23:34:11 +02:00
2012-06-03 15:01:34 +02:00
2012-04-22 22:26:55 +02:00
2012-05-25 13:40:12 +02:00
2012-06-02 23:43:31 +02:00
2012-06-03 17:40:30 +02:00
2012-05-25 13:40:12 +02:00
2012-05-13 11:25:24 +02:00
2012-05-25 13:40:12 +02:00
2012-05-07 20:08:56 +02:00
2012-05-25 13:40:12 +02:00
2012-05-25 13:40:12 +02:00
2012-06-01 00:35:06 +02:00
2012-05-27 01:13:37 +02:00
2012-06-01 17:07:07 +02:00
2012-05-22 11:56:18 +00:00
2012-05-12 03:36:17 +02:00
2012-04-22 22:26:55 +02:00
2012-05-08 11:02:12 +02:00
2012-05-12 10:58:08 +02:00
2012-06-03 17:12:57 +02:00
2012-05-05 02:02:56 +02:00
2012-04-21 18:56:19 +01:00
2012-05-28 17:24:13 +02:00