Changeset 7ae5cadb in ffmpeg

Timestamp:

Mar 18, 2014, 12:30:20 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c56d25c4

Parents:

ceb0d79f (diff), ca80e158 (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 commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'

• commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065': mpegts: Forward error codes in various functions

Conflicts:

libavformat/mpegts.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)