aboutsummaryrefslogtreecommitdiffstats
path: root/tools/enum_options.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-06 13:48:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-06 13:51:01 +0100
commitd1134ababdbd55ef0330c09deccfb32daaa809b5 (patch)
treee5f9df34d172f8e1b34823d26eb7da4e6b10f045 /tools/enum_options.c
parentd701f5996daf64f5abac8e402b7b62d5c48c63e1 (diff)
parentfe80fa53bc4977ef6e8e749a9df8ca5590a09307 (diff)
downloadffmpeg-d1134ababdbd55ef0330c09deccfb32daaa809b5.tar.gz
Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'
* commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307': 4xm: replace forcing EMU_EDGE by a copy Conflicts: libavcodec/4xm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions