RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
68,085 Commits 36 Branches 392 Tags 215 MiB
Commit Graph

68085 Commits

Author SHA1 Message Date
TOYAMA Shin-ichi e01acd868b doc/decoders.texi: typo in description for option ifo_palette 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:07:01 +01:00
Michael Niedermayer 148506c965 Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0' 
* commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
  hevc: Spin the mv_mpv_mode calls in a stand alone function

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 01:32:55 +01:00
Michael Niedermayer 70e3fae88d Merge commit '1f80742f49a9a4e846c9f099387881abc87150b2' 
* commit '1f80742f49a9a4e846c9f099387881abc87150b2':
  qdm2: avoid integer overflow

See: ccfd8cffe8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 23:46:17 +01:00
Michael Niedermayer a82f3de053 Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71' 
* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
  vp9: Use the correct upper bound for seg_id

Conflicts:
	libavcodec/vp9.h
	libavcodec/vp9block.c

Not merged, the value was correct before as far as i can see

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 23:37:04 +01:00
Luca Barbato cd975d5658 hevc: Spin the mv_mpv_mode calls in a stand alone function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-11-21 23:17:37 +01:00
Michael Niedermayer ac967ad872 Merge commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3' 
* commit 'd466d82faaf6e0e57a3a4be5e38e3902ef251ac3':
  dvdsubdec: Do not leak on failure path

Conflicts:
	libavcodec/dvdsubdec.c

See: 7fa9f7ef1c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:36:01 +01:00
Michael Niedermayer ad2424e6b2 Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b' 
* commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b':
  libtwolame: prevent a NULL pointer dereference

See: a586b3d9b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:26:15 +01:00
Michael Niedermayer b9ffafbfcc avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS() 
This avoids null pointer dereferences in case memory allocation has failed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:15:32 +01:00
Michael Niedermayer 75819fafd8 avfilter/formats: free the correct pointer in ADD_FORMAT() 
Also only free it when it was not previously allocated to return to the
state prior to the failing function call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:13:44 +01:00
Michael Niedermayer 42f3cb419a Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed' 
* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
  lavfi: clean memory on error in ADD_FORMAT()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 22:12:46 +01:00
Michael Niedermayer 15ed7ca437 Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6' 
* commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
  xwma: Do not leak on failure path

Conflicts:
	libavformat/xwma.c

See: 375a0c03a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 21:30:47 +01:00
Michael Niedermayer 5af0a701a1 Merge commit 'aa8b39d999589154f79300de9038994d0093cd34' 
* commit 'aa8b39d999589154f79300de9038994d0093cd34':
  lavc: Move the libtwolame encoder registration to the list for external libraries

Conflicts:
	libavcodec/allcodecs.c

See: f5f98727b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 21:26:01 +01:00
Michael Niedermayer 0c3ebbf6a5 Changelog: add zygoaudio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 20:21:56 +01:00
Michael Niedermayer 018ce90284 avcodec/libspeexdec: more verbose error message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 20:08:56 +01:00
Michael Niedermayer d96d8e121f avcodec/libspeexdec: support zygoaudio 
Fixes Ticket1873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 20:08:05 +01:00
Michael Niedermayer 2ae2c60554 avcodec/vp6: Use av_freep(), avoid leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 18:03:27 +01:00
Michael Niedermayer 6995be43ae avdevice/avdevice.c: Use av_freep(), avoid leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 18:03:11 +01:00
Michael Niedermayer 883f85fa8f avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 18:02:41 +01:00
Michael Niedermayer c05310d469 avdevice/pulse_audio_common: Use av_freep(), avoid leaving stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 18:02:01 +01:00
Benoit Fouet 5d37d70b0b avformat/apngdec: add APNG demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 17:13:56 +01:00
Benoit Fouet 33acebd3cc avcodec/pngdec: add APNG support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 17:13:56 +01:00
Michael Niedermayer 367c9d33d6 avformat: replace some odd 30-60 rates by higher less odd ones in get_std_framerate() 
Fixes Ticket4012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 13:56:13 +01:00
Vittorio Giovara 1f80742f49 qdm2: avoid integer overflow 
CC: libav-stable@libav.org
Bug-Id: CID 700555
 2014-11-21 12:37:50 +00:00
Luca Barbato 312daa1589 vp9: Use the correct upper bound for seg_id 
And use a macro to make apparent why the value.

Bug-Id: CID 1108595
 2014-11-21 12:37:05 +00:00
Luca Barbato d466d82faa dvdsubdec: Do not leak on failure path 
CC: libav-stable@libav.org
Bug-Id: CID 1198262
 2014-11-21 12:36:19 +00:00
Vittorio Giovara a42d5c861f libtwolame: prevent a NULL pointer dereference 
CC: libav-stable@libav.org
Bug-Id: CID 1250330 / CID 1250335
 2014-11-21 12:27:07 +00:00
Vittorio Giovara 863ee8a855 lavfi: clean memory on error in ADD_FORMAT() 
CC: libav-stable@libav.org
Bug-Id: CID 1250334
 2014-11-21 12:27:07 +00:00
Luca Barbato fd9badd3cb xwma: Do not leak on failure path 
CC: libav-stable@libav.org
Bug-Id: CID 1087092
 2014-11-21 12:27:07 +00:00
Martin Storsjö aa8b39d999 lavc: Move the libtwolame encoder registration to the list for external libraries 
This makes sure the default behaviour of using the internal encoder
stays the same regardless if libtwolame is enabled or not (as for
any external library).

This fixes fate-lavf-mpg if libav is built with libtwolame enabled.

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-11-21 12:27:07 +00:00
Michael Niedermayer f0ae0354d3 avformat/avidec: fix handling dv in avi 
Fixes Ticket4086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-21 03:34:13 +01:00
Lukasz Marek ab922f9ef1 lavu/dict: add av_dict_get_string 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-21 01:25:54 +01:00
Lukasz Marek 7d75a399a4 lavc/options: fix rc_eq leak 
rc_eq is an option, so it is copied by av_opt_copy(dest, src); above.
 2014-11-21 01:19:53 +01:00
Michael Niedermayer 21ded9ce67 avcodec/imc: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:46:44 +01:00
Michael Niedermayer b054054c9b avcodec/dcadec: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:46:08 +01:00
Michael Niedermayer 9018bd1197 avcodec/atrac1: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:30:48 +01:00
Michael Niedermayer 8bce5c8e74 avcodec/ac3dec: Use avpriv_float_dsp_alloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 22:30:48 +01:00
Matthew Oliver 17b7f99d81 configure: disable strip when using icl. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 20:15:32 +01:00
Michael Niedermayer bab11fe7bf avcodec/mpeg12dec: forward error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 16:31:27 +01:00
Michael Niedermayer 1852b2a0f4 avcodec/mpeg12dec: Use more specific error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 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 <michaelni@gmx.at>
 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 <michaelni@gmx.at>
 2014-11-20 15:09:26 +01:00
Matthew Oliver e39f8fad32 configure: Prevent icl being incorrectly detected as msvc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 12:12:20 +01:00
Michael Niedermayer 9266eb0c62 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 11:41:30 +01:00
jessejiang 29d208d5d4 avutil/arm/float_dsp_init_vfp: replace restrict by av_restrict 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 11:17:42 +01:00
Carl Eugen Hoyos 25ccf5df72 lavf/mux: Always call write_trailer() from av_write_trailer() to avoid a leak. 
Fixes ticket #4049.
 2014-11-20 10:14:51 +01:00
Michael Niedermayer c661601f45 Changelog: add WebP muxer 
Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 03:21:05 +01:00
Michael Niedermayer 4388e78a0f swscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*() 
This avoids out of array accesses
Should fix Ticket3451

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 01:20:31 +01:00
Michael Niedermayer 0dba982bb4 avformat/dtsdec: dts_probe: check reserved bit, check lfe, check sr_code similarity 
Fixes misdetection of s16le
Fixes Ticket4109

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 00:21:09 +01:00
Michael Niedermayer fbb6de2ad7 Merge commit '7fd10f66b722eccc2ada9128766d002f6d751f79' 
* commit '7fd10f66b722eccc2ada9128766d002f6d751f79':
  hdsenc: Clear the previous codec tag when setting up the chained muxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 20:30:07 +01:00
Michael Niedermayer f3dcabef33 Merge commit 'f918b8a2933a65020cbe490ec637d5485c11a692' 
* commit 'f918b8a2933a65020cbe490ec637d5485c11a692':
  hdsenc: Use the right filename in an error message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-19 20:24:11 +01:00