Changeset d0979357 in ffmpeg

Timestamp:

Jun 1, 2014, 12:35:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9fb45334

Parents:

955b31a7 (diff), 41776ba9 (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 '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'

• commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5': avconv: do not use the stream codec context for decoding

Conflicts:

ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c

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

(No files)