diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 01:02:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 01:11:02 +0200 |
| commit | a105931d3edfd47f287e47e858ef080f0199cd47 (patch) | |
| tree | e9657f4a68b5b33a9a17877cdcd0ca368778f37a /libavformat | |
| parent | 48183f144d1d6f7af8e8526a2e020a6a88ad38c0 (diff) | |
| parent | 4978850ca2cb1ec6908f5bc79cc592ca454d11e8 (diff) | |
| download | ffmpeg-a105931d3edfd47f287e47e858ef080f0199cd47.tar.gz | |
Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
build: Split JPEG-related tables off into a separate component
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec_jpeg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 2028053536..6bf88f8c3a 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -24,6 +24,7 @@ #include "rtpdec.h" #include "rtpdec_formats.h" #include "libavutil/intreadwrite.h" +#include "libavcodec/jpegtables.h" #include "libavcodec/mjpeg.h" #include "libavcodec/bytestream.h" |