Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'e6e3dcba0c'

Browse source 
* commit 'e6e3dcba0c':
  mjpeg: Move code only used in the encoder(s) to the appropriate header

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-30 21:05:23 +02:00
commit 794e9fb5a6
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libavcodec/jpeglsenc.c
View file

@ -32,6 +32,7 @@
#include "internal.h"
#include "mathops.h"
#include "mjpeg.h"
#include "mjpegenc.h"
#include "jpegls.h"
/**