Changeset 9517900b in ffmpeg

Timestamp:

Mar 17, 2014, 11:36:48 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

377cfc2

Parents:

3e583380 (diff), e0c16e4e (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> (03/17/14 11:33:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 11:36:48)

Message:

Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'

• commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:

libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c

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

(No files)