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
83f230c2
Commit
83f230c2
authored
Mar 23, 2016
by
Mark Thompson
Committed by
Anton Khirnov
Mar 30, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: VAAPI MJPEG encoder
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
31fe1f25
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
1 deletion
+6
-1
Changelog
Changelog
+1
-1
configure
configure
+3
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
vaapi_encode_mjpeg.c
libavcodec/vaapi_encode_mjpeg.c
+0
-0
No files found.
Changelog
View file @
83f230c2
...
...
@@ -53,7 +53,7 @@ version <next>:
- compressed SWF
- VAAPI-accelerated format conversion and scaling
- libnpp/CUDA-accelerated format conversion and scaling
- VAAPI-accelerate H.264/HEVC encoding
- VAAPI-accelerate H.264/HEVC
/MJPEG
encoding
version 11:
...
...
configure
View file @
83f230c2
...
...
@@ -1989,6 +1989,8 @@ mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
mjpeg_decoder_select
=
"blockdsp hpeldsp idctdsp jpegtables"
mjpeg_encoder_select
=
"aandcttables jpegtables mpegvideoenc"
mjpegb_decoder_select
=
"mjpeg_decoder"
mjpeg_vaapi_encoder_deps
=
"VAEncPictureParameterBufferJPEG"
mjpeg_vaapi_encoder_select
=
"vaapi_encode jpegtables"
mlp_decoder_select
=
"mlp_parser"
motionpixels_decoder_select
=
"bswapdsp"
mp1_decoder_select
=
"mpegaudio"
...
...
@@ -4473,6 +4475,7 @@ check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
check_type
"va/va.h va/va_vpp.h"
"VAProcPipelineParameterBuffer"
check_type
"va/va.h va/va_enc_h264.h"
"VAEncPictureParameterBufferH264"
check_type
"va/va.h va/va_enc_hevc.h"
"VAEncPictureParameterBufferHEVC"
check_type
"va/va.h va/va_enc_jpeg.h"
"VAEncPictureParameterBufferJPEG"
check_type
"vdpau/vdpau.h"
"VdpPictureInfoHEVC"
...
...
libavcodec/Makefile
View file @
83f230c2
...
...
@@ -304,6 +304,7 @@ OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
OBJS-$(CONFIG_MJPEG_DECODER)
+=
mjpegdec.o
OBJS-$(CONFIG_MJPEG_ENCODER)
+=
mjpegenc.o
mjpegenc_common.o
OBJS-$(CONFIG_MJPEGB_DECODER)
+=
mjpegbdec.o
OBJS-$(CONFIG_MJPEG_VAAPI_ENCODER)
+=
vaapi_encode_mjpeg.o
OBJS-$(CONFIG_MLP_DECODER)
+=
mlpdec.o
mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER)
+=
mmvideo.o
OBJS-$(CONFIG_MOTIONPIXELS_DECODER)
+=
motionpixels.o
...
...
libavcodec/allcodecs.c
View file @
83f230c2
...
...
@@ -195,6 +195,7 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
MIMIC
,
mimic
);
REGISTER_ENCDEC
(
MJPEG
,
mjpeg
);
REGISTER_DECODER
(
MJPEGB
,
mjpegb
);
REGISTER_ENCODER
(
MJPEG_VAAPI
,
mjpeg_vaapi
);
REGISTER_DECODER
(
MMVIDEO
,
mmvideo
);
REGISTER_DECODER
(
MOTIONPIXELS
,
motionpixels
);
#if FF_API_XVMC
...
...
libavcodec/vaapi_encode_mjpeg.c
0 → 100644
View file @
83f230c2
This diff is collapsed.
Click to expand it.
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