diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 21:05:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 21:05:23 +0200 |
| commit | 794e9fb5a649b4489e7369eb846049d4a03f3ff9 (patch) | |
| tree | 775f1981d407c36b0ebdc8daa61bb3f2c920025d /libavcodec/mjpeg.h | |
| parent | 847c0d333b6a195670f5bd64e9f7e5c9cf254cc4 (diff) | |
| parent | e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80 (diff) | |
Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'
* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
mjpeg: Move code only used in the encoder(s) to the appropriate header
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
| -rw-r--r-- | libavcodec/mjpeg.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 73db1dd1eb..0e62b2aeff 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -36,7 +36,6 @@ #include "libavutil/internal.h" #include "avcodec.h" -#include "put_bits.h" /* JPEG marker codes */ typedef enum { @@ -120,12 +119,6 @@ typedef enum { /* 0x02 -> 0xbf reserved */ } JPEG_MARKER; -static inline void put_marker(PutBitContext *p, int code) -{ - put_bits(p, 8, 0xff); - put_bits(p, 8, code); -} - #define PREDICT(ret, topleft, top, left, predictor)\ switch(predictor){\ case 0: ret= 0; break;\ |