Changeset a8e96383 in ffmpeg

Timestamp:

Aug 3, 2013, 7:16:36 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fa5410f6

Parents:

8e970a58 (diff), b5a13865 (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 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'

• commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays

Conflicts:

libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c

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

(No files)