Changeset 6732f43 in ffmpeg

Timestamp:

Feb 10, 2014, 11:36:32 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1e5656bf

Parents:

ee2c1e6 (diff), 38893dc0 (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 '38893dc028e458eaf3f906833d4ee515689edb7e'

• commit '38893dc028e458eaf3f906833d4ee515689edb7e': pcmdec: replace a reachable assert with an error check

Conflicts:

libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

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

(No files)