Changeset b0fdc766 in ffmpeg

Timestamp:

Jun 20, 2014, 4:00:42 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0a995311

Parents:

c2b1225 (diff), 650dee63 (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 '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'

• commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f': dv: get rid of global non-const tables

Conflicts:

libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c

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

(No files)