• Michael Niedermayer's avatar
    Merge commit '835f798c' · c1df467d
    Michael Niedermayer authored
    * commit '835f798c':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c1df467d
avcodec.h 173 KB