Changeset 7d82020f in ffmpeg

Timestamp:

Jun 3, 2012, 10:33:42 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4d6a8a2b

Parents:

e10eac91 (diff), 19dfbf19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)