diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-31 02:26:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-31 02:26:47 +0100 |
| commit | 0489af478e5f490aee2d96daa29043b590c8d280 (patch) | |
| tree | 4b87c989fd78132150f8bed362d19d081ac50e47 /libavcodec/libdirac.h | |
| parent | e484b64ce37e7bc7556c6113ce6f10671e20f61f (diff) | |
| parent | 45235d69c271966409cdd3eaa022258c22e04fdb (diff) | |
| download | ffmpeg-0489af478e5f490aee2d96daa29043b590c8d280.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libdirac/libschroedinger: Drop unnecessary symbol prefixes.
cmdutils: check fread() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libdirac.h')
| -rw-r--r-- | libavcodec/libdirac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libdirac.h b/libavcodec/libdirac.h index 0dc19ca338..abea0ca492 100644 --- a/libavcodec/libdirac.h +++ b/libavcodec/libdirac.h @@ -35,7 +35,7 @@ static const struct { enum PixelFormat ff_pix_fmt; dirac_chroma_t dirac_pix_fmt; -} ffmpeg_dirac_pixel_format_map[] = { +} dirac_pixel_format_map[] = { { PIX_FMT_YUV420P, format420 }, { PIX_FMT_YUV422P, format422 }, { PIX_FMT_YUV444P, format444 }, |