apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-02 13:24:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

Browse Source 
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
  build: Split JPEG-related tables off into a separate component

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-31 01:02:00 +02:00
parent 48183f144d 4978850ca2
commit a105931d3e
12 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mjpegenc.c
View File

@@ -33,6 +33,7 @@
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "jpegtables.h"
#include "mjpegenc_common.h"
#include "mpegvideo.h"
#include "mjpeg.h"