Changeset 218f58a1 in ffmpeg

Timestamp:

Jun 12, 2015, 6:57:37 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b5c71fba

Parents:

58f63670 (diff), e3d0f49 (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 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'

• commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d': mpegvideo: h263: Move all tables to a single file

Conflicts:

libavcodec/h263.h
libavcodec/h263data.h

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

(No files)