Changeset 862120f9 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0949ff93

Parents:

a87685d8 (diff), 3831362 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/01/14 13:40:47)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/01/14 13:53:23)

Message:

Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'

• commit '383136264ef40452efd86cafb2d7221cd3830b3d': avconv: do not use the stream codec context for encoding

Conflicts:

ffmpeg.c
ffmpeg_opt.c

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

(No files)