Changeset 1b58f137 in ffmpeg

Timestamp:
Jul 9, 2014, 8:27:07 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e932ae5
Parents:
9098f0ec (diff), f6ee61fb (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> (07/09/14 20:21:46)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (07/09/14 20:27:07)
Message:

Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'

Conflicts:

configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.