Skip to content
Snippets Groups Projects
Commit c1df467d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '835f798c'


* 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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9c712d0b 835f798c
No related branches found
No related tags found
No related merge requests found
Showing
with 157 additions and 147 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment