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
925b80d6
Commit
925b80d6
authored
May 31, 2015
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegvideo: Move OutFormat enum to mpegutils.h
It is necessary to avoid circular header dependencies.
parent
9bb11be0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
h263dec.c
libavcodec/h263dec.c
+1
-0
mpegutils.h
libavcodec/mpegutils.h
+8
-0
mpegvideo.h
libavcodec/mpegvideo.h
+1
-7
rv10.c
libavcodec/rv10.c
+1
-0
wmv2.c
libavcodec/wmv2.c
+1
-0
No files found.
libavcodec/h263dec.c
View file @
925b80d6
...
...
@@ -35,6 +35,7 @@
#include "mpeg_er.h"
#include "mpeg4video.h"
#include "mpeg4video_parser.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "qpeldsp.h"
...
...
libavcodec/mpegutils.h
View file @
925b80d6
...
...
@@ -115,6 +115,14 @@
#define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12)
enum
OutputFormat
{
FMT_MPEG1
,
FMT_H261
,
FMT_H263
,
FMT_MJPEG
,
};
/**
* Draw a horizontal band if supported.
*
...
...
libavcodec/mpegvideo.h
View file @
925b80d6
...
...
@@ -46,6 +46,7 @@
#include "put_bits.h"
#include "ratecontrol.h"
#include "parser.h"
#include "mpegutils.h"
#include "mpeg12data.h"
#include "qpeldsp.h"
#include "thread.h"
...
...
@@ -55,13 +56,6 @@
#define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded
enum
OutputFormat
{
FMT_MPEG1
,
FMT_H261
,
FMT_H263
,
FMT_MJPEG
,
};
#define MAX_FCODE 7
#define MAX_THREADS 16
...
...
libavcodec/rv10.c
View file @
925b80d6
...
...
@@ -34,6 +34,7 @@
#include "h263.h"
#include "internal.h"
#include "mpeg_er.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "mpegvideodata.h"
...
...
libavcodec/wmv2.c
View file @
925b80d6
...
...
@@ -20,6 +20,7 @@
#include "avcodec.h"
#include "idctdsp.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "msmpeg4data.h"
#include "simple_idct.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