diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-08-21 17:35:28 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-10-16 20:26:28 +0200 |
| commit | c359d624d3efc3fd1d83210d78c4152bd329b765 (patch) | |
| tree | 6e0cffd42aff5636052d4540c1d56b7be579e8cf /libavformat/hevcdec.c | |
| parent | 4abe3b049d987420eb891f74a35af2cebbf52144 (diff) | |
| download | ffmpeg-c359d624d3efc3fd1d83210d78c4152bd329b765.tar.gz | |
hevcdec: move decoder-independent declarations into a separate header
This way they can be reused by other code without including the whole
decoder-specific hevcdec.h
Also, add the HEVC_ prefix to them, since similarly named values exist
for H.264 as well and are sometimes used in the same code.
Diffstat (limited to 'libavformat/hevcdec.c')
| -rw-r--r-- | libavformat/hevcdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c index 75b2cd3916..c186b1ac1d 100644 --- a/libavformat/hevcdec.c +++ b/libavformat/hevcdec.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/hevcdec.h" +#include "libavcodec/hevc.h" #include "avformat.h" #include "rawdec.h" @@ -43,15 +43,15 @@ static int hevc_probe(AVProbeData *p) return 0; switch (type) { - case NAL_VPS: vps++; break; - case NAL_SPS: sps++; break; - case NAL_PPS: pps++; break; - case NAL_BLA_N_LP: - case NAL_BLA_W_LP: - case NAL_BLA_W_RADL: - case NAL_CRA_NUT: - case NAL_IDR_N_LP: - case NAL_IDR_W_RADL: irap++; break; + case HEVC_NAL_VPS: vps++; break; + case HEVC_NAL_SPS: sps++; break; + case HEVC_NAL_PPS: pps++; break; + case HEVC_NAL_BLA_N_LP: + case HEVC_NAL_BLA_W_LP: + case HEVC_NAL_BLA_W_RADL: + case HEVC_NAL_CRA_NUT: + case HEVC_NAL_IDR_N_LP: + case HEVC_NAL_IDR_W_RADL: irap++; break; } } } |