har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,998 Commits 2 Branches 401 Tags
Commit Graph

133 Commits

Author SHA1 Message Date
banastasov
debf4d6e67 avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment() 
Fixes Ticket4326

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 04:29:58 +02:00
Michael Niedermayer
9f0b898e82 avcodec/dvbsubdec: Clear w/h/size on region buffer allocation failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-14 23:25:39 +02:00
Michael Niedermayer
e06dde52d7 avcodec/dvbsubdec: Do not return a value from a function returning void 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-26 13:47:12 +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 <michaelni@gmx.at>
 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
c5b6b711b2 Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812' 
* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
  dvbsubdec: check memory allocations and propagate errors

Conflicts:
	libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 20:25:40 +01:00
Vittorio Giovara
607ad990d3 dvbsubdec: check memory allocations and propagate errors 2015-01-27 15:26:37 +00:00
Michael Niedermayer
8de0990e9f avcodec/dvbsubdec: Check get_region() return value 
Fixes null pointer dereference with DEBUG enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 16:33:02 +01:00
Michael Niedermayer
1bf747ae84 avcodec/dvbsubdec: Return proper error codes from more functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 19:24:27 +01:00
Michael Niedermayer
ebe3a41ea3 avcodec/dvbsubdec: Add some av_malloc() failure checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-10 19:21:58 +01:00
Michael Niedermayer
ce800d4695 avcodec/dvbsubdec: Remove redundant "DVBSub error" prefix 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 02:03:08 +01:00
Michael Niedermayer
4ba0141921 avcodec/dvbsubdec: Pass context to av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-05 20:33:57 +01:00
Michael Niedermayer
d03867c248 avcodec/dvbsubdec: av_assert* instead of assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 20:08:24 +01:00
Michael Niedermayer
39dfe6801a avcodec/dvbsubdec: Cleanup on *malloc failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 17:54:52 +01:00
Michael Niedermayer
287eb69973 Merge commit '443502aed8b814d883825e52e91e4f018955aa66' 
* commit '443502aed8b814d883825e52e91e4f018955aa66':
  dvbsubdec: move shared codepath

Conflicts:
	libavcodec/dvbsubdec.c

The merged code is ignored and the factorization redone with
the code that is in FFmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 23:08:55 +01:00
Michael Niedermayer
e0c36f5825 avcodec/dvbsubdec: Fix 8bit non_mod case 
Untested, i failed to find a sample which triggers this case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:57:01 +01:00
Michael Niedermayer
2813dabdd4 avcodec/dvbsubdec: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:20:20 +01:00
Michael Niedermayer
4809ac75fc Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8' 
* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
	libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:19:54 +01:00
Michael Niedermayer
6229f7823e avcodec/dvbsubdec: Add return code to save_subtitle_set() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-11 22:15:14 +01:00
Vittorio Giovara
443502aed8 dvbsubdec: move shared codepath 
CC: libav-stable@libav.org
Bug-Id: CID 1238839
 2014-11-11 11:49:54 +01:00
Vittorio Giovara
2383323661 dvbsubdec: improve error checking 
Use av_mallocz_array instead of iterating and check the returned memory.
Check returned memory and cleanly exit in case of error during the loop.
Avoid a null pointer dereference for invalid data.

CC: libav-stable@libav.org
Bug-Id: CID 29575
 2014-11-11 11:49:54 +01:00
Jernej Fijačko
1bdd21d975 dvbsubdec: add missing break 
Fix a memory leak too.

CC: libav-stable@libav.org
Bug-Id: CID 732230
 2014-11-11 11:49:54 +01:00
Michael Niedermayer
adfc3b81b1 avcodec/dvbsubdec: use av_freep() to avoid leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-30 23:29:33 +01:00
Michael Niedermayer
25a360286d avcodec/dvbsubdec: merge declaration and init 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-30 23:28:15 +01:00
Michael Niedermayer
a2dbf379f0 avcodec/dvbsubdec: make compute_edt user settable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 19:51:58 +02:00
Michael Niedermayer
0014541e9a avcodec/dvbsubdec: dont mix integers with pointers 
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-16 15:58:40 +02:00
Anshul Maheshwari
7d1898ebcc avcodec/dvbsubdec: removed unnecessary null check for subtitle 
In refrence to coverity defect 1224278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Anshul Maheshwari
263932c084 avcodec/dvbsubdec: fix ignoring blank frame by updating got_output 
fix ticket 3737

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 14:35:58 +02:00
Anshul Maheshwari
ca2f59e121 avcodec/dvbsubdec: support returning exact end times 
fixess part of ticket #2024

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 21:06:49 +02:00
Anshul Maheshwari
fbb59a3bf4 avcodec/dvbsubdec: Split save_subtitle_set() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 20:16:49 +02:00
Anshul Maheshwari
77ade55fe5 avcodec/dvbsubdec: add AVClass to context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 19:59:26 +02:00
Anshul Maheshwari
9a11b33a2d avcodec/dvbsubdec: restructure version check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 19:56:09 +02:00
Michael Niedermayer
8f4b176c55 avcodec/dvbsubdec: add some basic av_log debuging support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-04 18:09:18 +02:00
Michael Niedermayer
994a582a02 avcodec/dvbsubdec: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 20:08:30 +02:00
Michael Niedermayer
5440151fa4 Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d' 
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
  Remove a number of unnecessary dsputil.h #includes

Conflicts:
	libavcodec/h264pred.c
	libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-05 18:54:15 +02:00
Diego Biurrun
3dc6272bed Remove a number of unnecessary dsputil.h #includes 2014-04-04 19:08:05 +02:00
Michael Niedermayer
6016b8329b Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852' 
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
  dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Conflicts:
	libavcodec/bit_depth_template.c
	libavcodec/motionpixels_tablegen.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:39:51 +01:00
Diego Biurrun
05563ccacc dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names 
Also switch from "tbl" to "tab" name suffixes.
 2014-03-13 08:12:44 -07:00
mrlika
36a6297953 avcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:14:57 +01:00
Michael Niedermayer
cf812d8129 avcodec/dvbsubdec: Remove unused display_list_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 01:22:48 +01:00
Wim Vander Schelden
af09be4f4b Fixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without freeing the associated rects. 
Signed-off-by: Wim Vander Schelden <lists@fixnum.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-25 00:41:57 +01:00
Pierre Yves MORDRET
0f02ea0afe libavcodec/dvbsub: fix for Display Definition Segment 
Given ETSI EN 300 743 V1.3.1 (2006-11), 7.2.1 Display definition segment
display window parameters are given in this order XMin, XMax, YMin, YMax
if  display_window_flag is set, but here this is not the case.
As a consequence the DVB subtitles are not displayed upon some videos.

Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-13 16:53:22 +01:00
Michael Niedermayer
48f37664a8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:39:31 +01:00
Diego Biurrun
86f910806b Remove #undefs for formerly forbidden system functions 
The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.
 2013-11-07 00:26:15 +01:00
Michael Niedermayer
ee77140afa Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2' 
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
  cosmetics: Group .name and .long_name together in codec/format declarations

Conflicts:
	libavcodec/8svx.c
	libavcodec/alac.c
	libavcodec/cljr.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/dpxenc.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/ffv1dec.c
	libavcodec/flacdec.c
	libavcodec/flvdec.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g726.c
	libavcodec/gif.c
	libavcodec/gifdec.c
	libavcodec/h261dec.c
	libavcodec/h263dec.c
	libavcodec/iff.c
	libavcodec/imc.c
	libavcodec/libopencore-amr.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libspeexenc.c
	libavcodec/libvo-amrwbenc.c
	libavcodec/libvorbisenc.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/libxavs.c
	libavcodec/libxvid.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/msmpeg4dec.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/proresdec_lgpl.c
	libavcodec/proresenc_kostya.c
	libavcodec/ra144enc.c
	libavcodec/rawdec.c
	libavcodec/rv10.c
	libavcodec/sp5xdec.c
	libavcodec/takdec.c
	libavcodec/tta.c
	libavcodec/v210dec.c
	libavcodec/vp6.c
	libavcodec/wavpack.c
	libavcodec/xbmenc.c
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-04 12:34:23 +02:00
Diego Biurrun
b2bed9325d cosmetics: Group .name and .long_name together in codec/format declarations 2013-10-03 23:32:01 +02:00
Reimar Döffinger
29f244e08e dvbsubdec: Check for invalid clut selector. 
Fail decoding if strict compliance is requested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-09-21 09:51:10 +02:00
JULIAN GARDNER
97ff584af4 Apply clut changes only to one table. 
The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-09-21 09:51:09 +02:00
Reimar Döffinger
fe79fc2ea5 dvbsubdec: set width/height from display def if not set. 
This fixes playback of DVB subtitles in
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket1065/Test1.wtv
in MPlayer.
FFplay is not affected since it assumes that the subtitles
are scaled to match the video - but this usually isn't the
case after rescaling the video and stream-copying subtitles.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-08-31 19:58:09 +02:00
Michael Niedermayer
7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-07 22:45:46 +02:00