generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,170 Commits 24 Branches 241 Tags 173 MiB
2fc970a6b8
Commit Graph

14 Commits

Author SHA1 Message Date
Michael Niedermayer
c5e295cb9d avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-19 03:03:40 +02:00
Michael Niedermayer
81a663f49e Drop remaining unneeded != NULL 
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 22:47:45 +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 <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
Gabriel Dume
f929ab0569 cosmetics: Write NULL pointer equality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 03:18:18 -07:00
Michael Niedermayer
bd650ee318 avcodec/mpegaudiodec: Reset dither and mdct state 
This makes the mp3 decoder produce the same result when repeatly flushing and decoding

Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-05 21:25:51 +02:00
Michael Niedermayer
0be95996d0 avcodec/mpegaudiodec_template: make shift unsigned to avoid undefined behavior 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-09 13:17:39 +02:00
Michael Niedermayer
afbe8c6a84 avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 21:00:58 +01:00
Michael Niedermayer
2545182c29 avcodec/mpegaudiodec_template/mp3on4: check that all channels have been decoded before returnig a frame 
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f80bf9a259e_5774_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 20:56:08 +01:00
Michael Niedermayer
c925e960e8 mp3on4: fail when the header check fails 
It seems the code assumed that when one out of multiple blocks fail
some span of time is correct, its not, its some channels
that are correct

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f44a03ba3ce_5692_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-02 18:53:41 +01:00
Michael Niedermayer
30ee4b3393 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mp3adu: Set the channel layout properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 13:02:20 +01:00
Martin Storsjö
35686a289f mp3adu: Set the channel layout properly 
This fixes decoding, broken since 7e35037.

This is similar to what was done for the normal mp3 decoder in
f4a86bc9.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-12-12 10:18:25 +02:00
Michael Niedermayer
babb611d35 libavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT 
The CONFIG_ name-space is set by configure, so its better to use a
different prefix here.
This also unifies the encoder & decoder define that is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-03 21:12:00 +01:00
Michael Niedermayer
f67ec7f3a2 Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85' 
* commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85':
  mpegaudiodec: Consistently handle fixed/float templating

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:12:07 +01:00
Diego Biurrun
0eeeb9647e mpegaudiodec: Consistently handle fixed/float templating 2013-11-23 21:36:49 +01:00