Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
2f15846a
Commit
2f15846a
authored
May 29, 2015
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegvideo: wmv2: Move function declarations
parent
902a55f7
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
12 deletions
+19
-12
h263dec.c
libavcodec/h263dec.c
+1
-0
mpegvideo.c
libavcodec/mpegvideo.c
+1
-0
mpegvideo.h
libavcodec/mpegvideo.h
+0
-11
mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+1
-0
mpegvideo_motion.c
libavcodec/mpegvideo_motion.c
+1
-0
msmpeg4.h
libavcodec/msmpeg4.h
+0
-1
msmpeg4dec.c
libavcodec/msmpeg4dec.c
+1
-0
wmv2.h
libavcodec/wmv2.h
+14
-0
No files found.
libavcodec/h263dec.c
View file @
2f15846a
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
#include "msmpeg4.h"
#include "msmpeg4.h"
#include "qpeldsp.h"
#include "qpeldsp.h"
#include "thread.h"
#include "thread.h"
#include "wmv2.h"
static
enum
AVPixelFormat
h263_get_format
(
AVCodecContext
*
avctx
)
static
enum
AVPixelFormat
h263_get_format
(
AVCodecContext
*
avctx
)
{
{
...
...
libavcodec/mpegvideo.c
View file @
2f15846a
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
#include "qpeldsp.h"
#include "qpeldsp.h"
#include "xvmc_internal.h"
#include "xvmc_internal.h"
#include "thread.h"
#include "thread.h"
#include "wmv2.h"
#include <limits.h>
#include <limits.h>
static
const
uint8_t
ff_default_chroma_qscale_table
[
32
]
=
{
static
const
uint8_t
ff_default_chroma_qscale_table
[
32
]
=
{
...
...
libavcodec/mpegvideo.h
View file @
2f15846a
...
@@ -851,17 +851,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s);
...
@@ -851,17 +851,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s);
int
ff_msmpeg4_decode_ext_header
(
MpegEncContext
*
s
,
int
buf_size
);
int
ff_msmpeg4_decode_ext_header
(
MpegEncContext
*
s
,
int
buf_size
);
int
ff_msmpeg4_decode_init
(
AVCodecContext
*
avctx
);
int
ff_msmpeg4_decode_init
(
AVCodecContext
*
avctx
);
int
ff_msmpeg4_encode_init
(
MpegEncContext
*
s
);
int
ff_msmpeg4_encode_init
(
MpegEncContext
*
s
);
int
ff_wmv2_decode_picture_header
(
MpegEncContext
*
s
);
int
ff_wmv2_decode_secondary_picture_header
(
MpegEncContext
*
s
);
void
ff_wmv2_add_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
uint8_t
*
dest_y
,
uint8_t
*
dest_cb
,
uint8_t
*
dest_cr
);
void
ff_mspel_motion
(
MpegEncContext
*
s
,
uint8_t
*
dest_y
,
uint8_t
*
dest_cb
,
uint8_t
*
dest_cr
,
uint8_t
**
ref_picture
,
op_pixels_func
(
*
pix_op
)[
4
],
int
motion_x
,
int
motion_y
,
int
h
);
int
ff_wmv2_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
void
ff_wmv2_encode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
int
motion_x
,
int
motion_y
);
int
ff_mpeg_ref_picture
(
AVCodecContext
*
avctx
,
Picture
*
dst
,
Picture
*
src
);
int
ff_mpeg_ref_picture
(
AVCodecContext
*
avctx
,
Picture
*
dst
,
Picture
*
src
);
void
ff_mpeg_unref_picture
(
AVCodecContext
*
avctx
,
Picture
*
picture
);
void
ff_mpeg_unref_picture
(
AVCodecContext
*
avctx
,
Picture
*
picture
);
...
...
libavcodec/mpegvideo_enc.c
View file @
2f15846a
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
#include "mpeg4video.h"
#include "mpeg4video.h"
#include "internal.h"
#include "internal.h"
#include "bytestream.h"
#include "bytestream.h"
#include "wmv2.h"
#include <limits.h>
#include <limits.h>
#define QUANT_BIAS_SHIFT 8
#define QUANT_BIAS_SHIFT 8
...
...
libavcodec/mpegvideo_motion.c
View file @
2f15846a
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include "mjpegenc.h"
#include "mjpegenc.h"
#include "msmpeg4.h"
#include "msmpeg4.h"
#include "qpeldsp.h"
#include "qpeldsp.h"
#include "wmv2.h"
#include <limits.h>
#include <limits.h>
static
void
gmc1_motion
(
MpegEncContext
*
s
,
static
void
gmc1_motion
(
MpegEncContext
*
s
,
...
...
libavcodec/msmpeg4.h
View file @
2f15846a
...
@@ -54,7 +54,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
...
@@ -54,7 +54,6 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
int
n
,
int
coded
,
const
uint8_t
*
scan_table
);
int
n
,
int
coded
,
const
uint8_t
*
scan_table
);
int
ff_msmpeg4_pred_dc
(
MpegEncContext
*
s
,
int
n
,
int
ff_msmpeg4_pred_dc
(
MpegEncContext
*
s
,
int
n
,
int16_t
**
dc_val_ptr
,
int
*
dir_ptr
);
int16_t
**
dc_val_ptr
,
int
*
dir_ptr
);
int
ff_wmv2_decode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
]);
#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
CONFIG_MSMPEG4V2_DECODER || \
CONFIG_MSMPEG4V2_DECODER || \
...
...
libavcodec/msmpeg4dec.c
View file @
2f15846a
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
#include "mpeg4video.h"
#include "mpeg4video.h"
#include "msmpeg4data.h"
#include "msmpeg4data.h"
#include "vc1data.h"
#include "vc1data.h"
#include "wmv2.h"
#define DC_VLC_BITS 9
#define DC_VLC_BITS 9
#define V2_INTRA_CBPC_VLC_BITS 3
#define V2_INTRA_CBPC_VLC_BITS 3
...
...
libavcodec/wmv2.h
View file @
2f15846a
...
@@ -56,4 +56,18 @@ typedef struct Wmv2Context {
...
@@ -56,4 +56,18 @@ typedef struct Wmv2Context {
void
ff_wmv2_common_init
(
Wmv2Context
*
w
);
void
ff_wmv2_common_init
(
Wmv2Context
*
w
);
int
ff_wmv2_decode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
]);
int
ff_wmv2_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
void
ff_wmv2_encode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
int
motion_x
,
int
motion_y
);
int
ff_wmv2_decode_picture_header
(
MpegEncContext
*
s
);
int
ff_wmv2_decode_secondary_picture_header
(
MpegEncContext
*
s
);
void
ff_wmv2_add_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
uint8_t
*
dest_y
,
uint8_t
*
dest_cb
,
uint8_t
*
dest_cr
);
void
ff_mspel_motion
(
MpegEncContext
*
s
,
uint8_t
*
dest_y
,
uint8_t
*
dest_cb
,
uint8_t
*
dest_cr
,
uint8_t
**
ref_picture
,
op_pixels_func
(
*
pix_op
)[
4
],
int
motion_x
,
int
motion_y
,
int
h
);
#endif
/* AVCODEC_WMV2_H */
#endif
/* AVCODEC_WMV2_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment