virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/vc1: Factorize imode enum out / remove duplication

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-14 05:16:25 +01:00
parent ecb21d2437
commit 2cfccd8060
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/vc1.c
View File

@ -47,21 +47,6 @@
* @{ * @{
*/ */
/**
* Imode types
* @{
*/
enum Imode {
IMODE_RAW,
IMODE_NORM2,
IMODE_DIFF2,
IMODE_NORM6,
IMODE_DIFF6,
IMODE_ROWSKIP,
IMODE_COLSKIP
};
/** @} */ //imode defines
/** Decode rows by checking if they are skipped /** Decode rows by checking if they are skipped
* @param plane Buffer to store decoded bits * @param plane Buffer to store decoded bits
* @param[in] width Width of this buffer * @param[in] width Width of this buffer

15
libavcodec/vc1.h
View File

@ -175,6 +175,21 @@ enum FrameCodingMode {
ILACE_FIELD ///< in the bitstream is reported as 11b ILACE_FIELD ///< in the bitstream is reported as 11b
}; };
/**
* Imode types
* @{
*/
enum Imode {
IMODE_RAW,
IMODE_NORM2,
IMODE_DIFF2,
IMODE_NORM6,
IMODE_DIFF6,
IMODE_ROWSKIP,
IMODE_COLSKIP
};
/** @} */ //imode defines
/** The VC1 Context /** The VC1 Context
* @todo Change size wherever another size is more efficient * @todo Change size wherever another size is more efficient
* Many members are only used for Advanced Profile * Many members are only used for Advanced Profile

14
libavcodec/vc1dec.c
View File

@ -59,20 +59,6 @@ static const int offset_table2[9] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
* @{ * @{
*/ */
/**
* Imode types
* @{
*/
enum Imode {
IMODE_RAW,
IMODE_NORM2,
IMODE_DIFF2,
IMODE_NORM6,
IMODE_DIFF6,
IMODE_ROWSKIP,
IMODE_COLSKIP
};
/** @} */ //imode defines
static void init_block_index(VC1Context *v) static void init_block_index(VC1Context *v)
{ {