Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
31a117a0
Commit
31a117a0
authored
May 29, 2015
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegvideo: msmpeg4: Move function declarations
parent
2f15846a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
12 deletions
+13
-12
mpegvideo.h
libavcodec/mpegvideo.h
+0
-12
msmpeg4.h
libavcodec/msmpeg4.h
+11
-0
mss2.c
libavcodec/mss2.c
+1
-0
vc1dec.c
libavcodec/vc1dec.c
+1
-0
No files found.
libavcodec/mpegvideo.h
View file @
31a117a0
...
...
@@ -840,18 +840,6 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number);
int
ff_rv_decode_dc
(
MpegEncContext
*
s
,
int
n
);
void
ff_rv20_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
/* msmpeg4.c */
void
ff_msmpeg4_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
void
ff_msmpeg4_encode_ext_header
(
MpegEncContext
*
s
);
void
ff_msmpeg4_encode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
int
motion_x
,
int
motion_y
);
int
ff_msmpeg4_decode_picture_header
(
MpegEncContext
*
s
);
int
ff_msmpeg4_decode_ext_header
(
MpegEncContext
*
s
,
int
buf_size
);
int
ff_msmpeg4_decode_init
(
AVCodecContext
*
avctx
);
int
ff_msmpeg4_encode_init
(
MpegEncContext
*
s
);
int
ff_mpeg_ref_picture
(
AVCodecContext
*
avctx
,
Picture
*
dst
,
Picture
*
src
);
void
ff_mpeg_unref_picture
(
AVCodecContext
*
avctx
,
Picture
*
picture
);
void
ff_free_picture_tables
(
Picture
*
pic
);
...
...
libavcodec/msmpeg4.h
View file @
31a117a0
...
...
@@ -49,12 +49,23 @@ void ff_msmpeg4_handle_slices(MpegEncContext *s);
void
ff_msmpeg4_encode_motion
(
MpegEncContext
*
s
,
int
mx
,
int
my
);
int
ff_msmpeg4_coded_block_pred
(
MpegEncContext
*
s
,
int
n
,
uint8_t
**
coded_block_ptr
);
int
ff_msmpeg4_encode_init
(
MpegEncContext
*
s
);
void
ff_msmpeg4_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
void
ff_msmpeg4_encode_ext_header
(
MpegEncContext
*
s
);
void
ff_msmpeg4_encode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
int
motion_x
,
int
motion_y
);
int
ff_msmpeg4_decode_init
(
AVCodecContext
*
avctx
);
int
ff_msmpeg4_decode_picture_header
(
MpegEncContext
*
s
);
int
ff_msmpeg4_decode_ext_header
(
MpegEncContext
*
s
,
int
buf_size
);
int
ff_msmpeg4_decode_motion
(
MpegEncContext
*
s
,
int
*
mx_ptr
,
int
*
my_ptr
);
int
ff_msmpeg4_decode_block
(
MpegEncContext
*
s
,
int16_t
*
block
,
int
n
,
int
coded
,
const
uint8_t
*
scan_table
);
int
ff_msmpeg4_pred_dc
(
MpegEncContext
*
s
,
int
n
,
int16_t
**
dc_val_ptr
,
int
*
dir_ptr
);
#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
CONFIG_MSMPEG4V2_DECODER || \
CONFIG_MSMPEG4V3_DECODER || \
...
...
libavcodec/mss2.c
View file @
31a117a0
...
...
@@ -27,6 +27,7 @@
#include "error_resilience.h"
#include "internal.h"
#include "mpeg_er.h"
#include "msmpeg4.h"
#include "msmpeg4data.h"
#include "qpeldsp.h"
#include "vc1.h"
...
...
libavcodec/vc1dec.c
View file @
31a117a0
...
...
@@ -32,6 +32,7 @@
#include "internal.h"
#include "mpeg_er.h"
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "msmpeg4data.h"
#include "vc1.h"
#include "vc1data.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