libretro/FFmpeg
1
0 Fork 0
mirror of https://github.com/libretro/FFmpeg.git synced 2026-11-12 08:51:31 -10:00
Code Issues Packages Projects Releases Wiki Activity
74,713 Commits 15 Branches 108 Tags
master
Commit Graph
146 Commits
Author SHA1 Message Date
Michael Niedermayer 1f86079376 avcodec/mpeg12dec: Check chroma_format 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-08-12 22:51:40 +02:00
wm4 94c0df79c7 lavc: propagate hwaccel errors 
At least the new videotoolbox decoder does not actually set a frame if
end_frame fails. This causes the API to return success and signals that
a picture was decoded, even though AVFrame->data[0] is NULL.

Fix this by propagating end_frame errors.
 2015-08-06 11:05:02 +02:00
Sebastien Zwickert 11d923d414 avcodec: add new Videotoolbox hwaccel. 2015-08-03 10:12:10 +02:00
James Almer 5d95f32bff avocdec/mpeg12dec: fix mpeg_xvmc hwaccel flag 
The flag is deprecated and as such didn't get a new AV_ prefixed version

Signed-off-by: James Almer <[email protected]>
 2015-07-27 21:09:53 -03:00
Michael Niedermayer 444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffplay.c
	libavcodec/8svx.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
	libavcodec/alac.c
	libavcodec/atrac3plusdec.c
	libavcodec/bink.c
	libavcodec/dnxhddec.c
	libavcodec/dvdec.c
	libavcodec/dvenc.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/fic.c
	libavcodec/flacdec.c
	libavcodec/flacenc.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/hevc.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libvo-aacenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec_float.c
	libavcodec/msmpeg4dec.c
	libavcodec/mxpegdec.c
	libavcodec/nvenc_h264.c
	libavcodec/nvenc_hevc.c
	libavcodec/pngdec.c
	libavcodec/qpeg.c
	libavcodec/ra288.c
	libavcodec/rv10.c
	libavcodec/s302m.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tiff.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/vp9.c
	libavcodec/wavpack.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <[email protected]>
 2015-07-27 22:50:18 +02:00
Michael Niedermayer 94d68a41fa Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615' 
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/aacdec.c
	libavcodec/aacenc.c
	libavcodec/ac3dec.c
	libavcodec/ac3enc_float.c
	libavcodec/atrac1.c
	libavcodec/atrac3.c
	libavcodec/atrac3plusdec.c
	libavcodec/dcadec.c
	libavcodec/ffv1enc.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb.c
	libavcodec/imc.c
	libavcodec/libmp3lame.c
	libavcodec/libtheoraenc.c
	libavcodec/libtwolame.c
	libavcodec/libvpxenc.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegaudiodec_template.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/nellymoserdec.c
	libavcodec/nellymoserenc.c
	libavcodec/nvenc.c
	libavcodec/on2avc.c
	libavcodec/options_table.h
	libavcodec/opus_celt.c
	libavcodec/pngenc.c
	libavcodec/ra288.c
	libavcodec/ratecontrol.c
	libavcodec/twinvq.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c
	libavcodec/vorbisdec.c
	libavcodec/vp3.c
	libavcodec/wma.c
	libavcodec/wmaprodec.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <[email protected]>
 2015-07-27 22:10:35 +02:00
Vittorio Giovara def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <[email protected]>
 2015-07-27 15:24:58 +01:00
Vittorio Giovara 7c6eb0a1b7 lavc: AV-prefix all codec flags 
Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <[email protected]>
 2015-07-27 15:24:58 +01:00
Carl Eugen Hoyos 8dad213143 lavc: Add properties field to AVCodecContext. 
The new field can hold information about losslessness and closed captions for now.
 2015-07-16 12:18:30 +02:00
Michael Niedermayer bfd17046c1 avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2 
Fixes Ticket4721

Signed-off-by: Michael Niedermayer <[email protected]>
 2015-07-15 00:09:15 +02:00
Michael Niedermayer fd116b8dfa Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61' 
* commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61':
  mpegvideo: Move tables to a separate file

Merged-by: Michael Niedermayer <[email protected]>
 2015-06-01 01:26:36 +02:00
Vittorio Giovara 378a00087f mpegvideo: Move tables to a separate file 2015-05-31 13:06:19 +02:00
Philip Langdale 9ae766d1c6 avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate header 
h264.h and hevc.h are mutually exclusive due to defining some of the same
names. As such, we need to avoid forcing h264.h to be included if we want
hevc decode acceleration to be possible.

However, some of the pre-hwaccel helper functions need h264.h. To avoid
messy collisions, let's move the declaration of all those helpers to
a separate header which we will exclude for the hevc support (which will
be hwaccel-only).

Signed-off-by: Philip Langdale <[email protected]>
 2015-05-25 19:50:41 -07:00
Michael Niedermayer 947b74ee7d Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772' 
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dxva2_vc1.c
	libavcodec/version.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <[email protected]>
 2015-05-25 22:24:34 +02:00
Steve Lhomme d8039ef8d2 D3D11va: add a Direct3D11 video decoder similar to DXVA2 
Signed-off-by: Luca Barbato <[email protected]>
 2015-05-25 11:47:08 +02:00
Michael Niedermayer d9b264bc73 Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42' 
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/ratecontrol.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <[email protected]>
 2015-05-22 20:24:41 +02:00
Vittorio Giovara 848e86f74d mpegvideo: Drop flags and flags2 
They are just duplicates of AVCodecContext members so use those instead.
 2015-05-22 15:34:39 +01:00
Michael Niedermayer d09321b68e avcodec/mpeg12dec: Fix chroma location 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-05-22 15:30:31 +02:00
Michael Niedermayer 33529104e5 avcodec/mpeg12dec: Fix "-flags +gray" 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-05-09 15:58:02 +02:00
Michael Niedermayer 7f45f7fc7f avcodec/mpeg12dec: use the correct dimensions for checking SAR 
Fixes Ticket4533

Signed-off-by: Michael Niedermayer <[email protected]>
 2015-05-05 04:33:44 +02:00
Michael Niedermayer 9d3357391c avcodec/mpeg12dec: Make ff_dlog() messages more clear 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-04-25 20:23:28 +02:00
Michael Niedermayer f4c311fef4 avcodec/mpeg12dec: Change mb decode tracing stuff to use ff_tlog() 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-04-25 19:42:49 +02:00
Michael Niedermayer 8f7b022c8c Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25' 
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
	libavcodec/aacdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/bitstream.c
	libavcodec/dcadec.c
	libavcodec/dnxhddec.c
	libavcodec/dvbsubdec.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/get_bits.h
	libavcodec/gifdec.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/imc.c
	libavcodec/interplayvideo.c
	libavcodec/jpeglsdec.c
	libavcodec/libopencore-amr.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_parser.c
	libavcodec/pngdec.c
	libavcodec/ratecontrol.c
	libavcodec/rv10.c
	libavcodec/svq1dec.c
	libavcodec/vqavideo.c
	libavcodec/wmadec.c

Merged-by: Michael Niedermayer <[email protected]>
 2015-04-20 04:10:10 +02:00
Vittorio Giovara 6a85dfc830 lavc: Replace av_dlog and tprintf with internal macros 2015-04-19 12:41:59 +01:00
Michael Niedermayer 37d93fdbf0 avcodec/mpeg12dec: Use check_marker() 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-04-14 15:30:39 +02:00
Michael Niedermayer 1932f7e2ee avcodec/mpeg12dec: Fix undefined shift 
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-03-11 04:24:57 +01:00
Michael Niedermayer 75cc57f73f avcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_info 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-01-02 03:22:51 +01:00
Michael Niedermayer 1010b36d86 avcodec/mpeg12dec: Recalculate SAR unconditionally 
Fixes Ticket4161

Signed-off-by: Michael Niedermayer <[email protected]>
 2015-01-02 03:22:51 +01:00
Michael Niedermayer aeb36fd207 avcodec/mpeg12dec: Move user data debug code out of unrelated if (buf_size > 29) 
Signed-off-by: Michael Niedermayer <[email protected]>
 2015-01-02 03:22:51 +01:00
Michael Niedermayer 9d921cce4f Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb' 
* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
  mpeg12dec: Use more specific error codes

Conflicts:
	libavcodec/mpeg12dec.c

See: 1852b2a0f4
Merged-by: Michael Niedermayer <[email protected]>
 2014-12-05 22:21:56 +01:00
Michael Niedermayer bcc43de51f Merge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1' 
* commit 'b56afb48aecb96e03347f5b569f16a64147c18b1':
  mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

Conflicts:
	libavcodec/mpeg12dec.c

See: 88b4c1a731
Merged-by: Michael Niedermayer <[email protected]>
 2014-12-05 22:10:12 +01:00
Michael Niedermayer 3a56bcee7c mpeg12dec: Use more specific error codes 
Signed-off-by: Vittorio Giovara <[email protected]>
 2014-12-03 12:50:52 +00:00
Michael Niedermayer b56afb48ae mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence() 
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-12-03 12:44:58 +00:00
Michael Niedermayer bab11fe7bf avcodec/mpeg12dec: forward error codes 
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-11-20 16:31:27 +01:00
Michael Niedermayer 1852b2a0f4 avcodec/mpeg12dec: Use more specific error codes 
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-11-20 16:29:42 +01:00
Michael Niedermayer 0f8908aa1b avcodec/mpeg12dec: do not fail on invalid frame_rate_index 
Fixes Ticket4073

Signed-off-by: Michael Niedermayer <[email protected]>
 2014-11-20 15:09:42 +01:00
Michael Niedermayer 88b4c1a731 avcodec/mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence() 
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-11-20 15:09:26 +01:00
Vittorio Giovara 5d29efe4b0 mpeg12dec: simplify context duplication 
CC: [email protected]
Bug-Id: CID 717453 / CID 717454 / CID 717915
 2014-11-06 10:44:46 -05:00
Michael Niedermayer 77f1199e8f avcodec/mpeg12dec: do not trust AVCodecContext input dimensions 
Fixes initial wtv dimensions
Fixes Ticket4070
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-11-05 02:00:22 +01:00
Michael Niedermayer 620e7f0f3b avcodec/mpeg12dec: fix time_base and framerate 
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

Signed-off-by: Michael Niedermayer <[email protected]>
 2014-10-15 15:54:02 +02:00
Michael Niedermayer 17085a0251 Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41' 
* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
  lavc: deprecate the use of AVCodecContext.time_base for decoding

Conflicts:
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpegvideo_parser.c
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <[email protected]>
 2014-10-15 15:49:31 +02:00
Anton Khirnov 7ea1b3472a lavc: deprecate the use of AVCodecContext.time_base for decoding 
When decoding, this field holds the inverse of the framerate that can be
written in the headers for some codecs. Using a field called 'time_base'
for this is very misleading, as there are no timestamps associated with
it. Furthermore, this field is used for a very different purpose during
encoding.

Add a new field, called 'framerate', to replace the use of time_base for
decoding.
 2014-10-15 06:37:43 +00:00
Michael Niedermayer b8a55994f0 avcodec/mpeg12dec: print aspect_ratio_info in debug output 
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-10-11 03:22:16 +02:00
Michael Niedermayer be5dd8aa55 Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088' 
* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <[email protected]>
 2014-09-27 03:38:48 +02:00
Rémi Denis-Courmont 4e03b2097c mpeg12: Always invoke the get_format() callback 
Signed-off-by: Luca Barbato <[email protected]>
 2014-09-26 21:28:37 +02:00
Michael Niedermayer 4dee4a4470 avcodec/mpegvideo: Factor ff_mpv_decode_init() out 
Reviewed-by: Benoit Fouet <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
 2014-09-05 20:48:06 +02:00
Michael Niedermayer 60dbed6067 Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867' 
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
  cosmetics: Write NULL pointer inequality checks more compactly

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/h263dec.c
	libavcodec/libxvid.c
	libavcodec/rv10.c
	libavcodec/utils.c
	libavformat/format.c
	libavformat/matroskadec.c
	libavformat/segment.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <[email protected]>
 2014-08-15 21:26:12 +02:00
Michael Niedermayer fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <[email protected]>
 2014-08-15 21:00:50 +02:00
Michael Niedermayer c1df467d73 Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b' 
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b':
  mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes

Conflicts:
	libavcodec/h261dec.c
	libavcodec/intrax8.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <[email protected]>
 2014-08-15 20:11:56 +02:00
Gabriel Dume 4b1f5e5090 cosmetics: Write NULL pointer inequality checks more compactly 
Signed-off-by: Diego Biurrun <[email protected]>
 2014-08-15 05:34:13 -07:00