Changeset 56afbe8d in ffmpeg

Timestamp:

Jun 23, 2014, 1:48:30 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

35bb7490

Parents:

ca35037 (diff), 7b9ef8d7 (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 '7b9ef8d701c319c26f7d0664fe977e176764c74e'

• commit '7b9ef8d701c319c26f7d0664fe977e176764c74e': mpeg: Split error resilience bits off into a separate file

Conflicts:

configure
libavcodec/Makefile
libavcodec/mpegvideo.c

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

(No files)