aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-15 20:00:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-15 20:11:56 +0200
commitc1df467d73ee8c6e792ec27c126c5f0e2bc1af9d (patch)
treef25896738e158d2744a4e72b1e21618cda4ba3bb /ffmpeg.h
parent9c712d0b1608ec998dbe41d81a79f3fb7ea32b4d (diff)
parent835f798c7d20bca89eb4f3593846251ad0d84e4b (diff)
downloadffmpeg-c1df467d73ee8c6e792ec27c126c5f0e2bc1af9d.tar.gz
Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions