generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,654 Commits 24 Branches 241 Tags 173 MiB
73562f1f83
Commit Graph

49654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
73562f1f83 Merge commit '8136f234445862c94d1c081606b2d1e3d44fccf3' 
* commit '8136f234445862c94d1c081606b2d1e3d44fccf3':
  yop: check for input overreads.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 16:25:16 +01:00
Michael Niedermayer
3138b158dd Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f' 
* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
  yop: check that extradata is large enough.

Conflicts:
	libavcodec/yop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 16:05:06 +01:00
Michael Niedermayer
769eba75ee Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d' 
* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d':
  qtrle: fix the topmost line for 1bit

Conflicts:
	tests/ref/fate/qtrle-1bit

See: 1af91978db

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 15:57:45 +01:00
Michael Niedermayer
68c0144d02 Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d' 
* commit '685e6f2e3939f124b41c7801cc541dad8252af3d':
  xxan: properly handle odd heights.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 15:26:32 +01:00
Michael Niedermayer
a845ac78c9 Merge commit '2cd4068071b9a8908823a3107f97e938211045ce' 
* commit '2cd4068071b9a8908823a3107f97e938211045ce':
  fraps: fix off-by one bug for version 1.

Conflicts:
	libavcodec/fraps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 15:21:39 +01:00
Michael Niedermayer
ddc3ca2caa Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177' 
* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177':
  aasc: fix output for msrle compression.
  msrledec: check bounds before constructing a possibly invalid pointer,
  cmdutils: remove ansi from the list of broken codecs.

Conflicts:
	tests/ref/fate/aasc

Also See: e7117f1c10

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 15:16:51 +01:00
Michael Niedermayer
6e9f3f3b65 Merge commit '238614de679a71970c20d7c3fee08a322967ec40' 
* commit '238614de679a71970c20d7c3fee08a322967ec40':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 14:53:49 +01:00
Michael Niedermayer
fadf845973 Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb' 
* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

Conflicts:
	libavformat/asf.c
	libavformat/asfdec.c
	libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 14:25:28 +01:00
Tim Walker
7af876a93f flac: add channel layout masks for streams with 7 or 8 channels 
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
 2013-02-06 12:53:15 +00:00
James Almer
8ab2173ed1 lavc/bink: Chech for malloc failure 
Signed-off-by: James Almer <jamrial@gmail.com>
 2013-02-06 12:35:33 +00:00
Michael Niedermayer
6c38884876 Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84' 
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 13:27:24 +01:00
Michael Niedermayer
0ddca7d416 dsputil: fixup half a dozen bugs with ptrdiff vs int linesize 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 13:22:19 +01:00
Michael Niedermayer
ede45c4e1d Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8' 
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 12:18:25 +01:00
Anton Khirnov
8136f23444 yop: check for input overreads. 
CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Anton Khirnov
06cf597c35 yop: check that extradata is large enough. 
CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Kostya Shishkov
89f11f498b qtrle: fix the topmost line for 1bit 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Kostya Shishkov
685e6f2e39 xxan: properly handle odd heights. 
Duplicate the last one or two chroma lines.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Anton Khirnov
2cd4068071 fraps: fix off-by one bug for version 1. 
CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Anton Khirnov
da7baaaae7 aasc: fix output for msrle compression. 
The bottom line was invalid before.

CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Anton Khirnov
238614de67 cdgraphics: do not rely on get_buffer() initializing the frame. 
Setting it to zero (instead of 128, as the default get_buffer() does)
also produces more correctly-looking output.
 2013-02-06 10:21:52 +01:00
Anton Khirnov
9bd6375d5f msrledec: check bounds before constructing a possibly invalid pointer, 
CC:libav-stable@libav.org
 2013-02-06 10:21:52 +01:00
Anton Khirnov
6ed9fc44ba svq1: replace struct svq1_frame_size with an array. 
It is used as an array in svq1enc, so this is more correct.
 2013-02-06 10:21:52 +01:00
Anton Khirnov
6a39985451 cmdutils: remove ansi from the list of broken codecs. 
It's not relying on get_buffer() initializing the frame since
99e36ddd3e.
 2013-02-06 10:21:52 +01:00
Anton Khirnov
99162f8d46 vf_yadif: silence a warning. 
clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
 2013-02-06 10:21:51 +01:00
Diego Biurrun
48a4ffa722 asf: K&R formatting cosmetics 2013-02-06 09:48:51 +01:00
Vladimir Pantelic
77bcb89600 vc1dec: use codec_id instead of codec_tag for VC1IMAGE 
the rest of the code is using codec_id everywhere already

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2013-02-06 09:34:32 +01:00
Michael Niedermayer
127ff88639 ffmpeg: do not call exit from exit_program() 
This should fix  Ticket2116

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 04:03:52 +01:00
Michael Niedermayer
68dfe530e0 vdpau: Rename union, avoid name conflict with vdpau 
Fixes Ticket2203

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 01:43:36 +01:00
Michael Niedermayer
ccf9dd00da ffmpeg: dont allow -flags to override -pass 
Fixes Ticket2154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 01:26:26 +01:00
Stefano Sabatini
a12787960e lavf/segment: extend PTS debugging log with -reset_timestamps 2013-02-06 00:40:09 +01:00
Stefano Sabatini
212bb6490f ffplay: report video frame changes only in debug mode 
In particular, remove distracting message:
"Video frame changed from size:0x0 format:none serial:-1 to ..."
 2013-02-06 00:20:37 +01:00
Stefano Sabatini
58c4b0f990 ffplay: extend feedback in case of video changes 2013-02-06 00:20:30 +01:00
Luca Barbato
b2a722a87e sh4: drop unused functions 
{avg,put}_pixels4_c are not used.
 2013-02-05 23:24:05 +01:00
Michael Niedermayer
f0eacbc760 dvenc: dont fail hard if the timecode is invalid 
Instead just dont store the timecode
Fixes Ticket2187

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 22:57:35 +01:00
Diego Biurrun
620289a20e sh4: Fix silly type vs. variable name search and replace typo 2013-02-05 22:53:44 +01:00
Michael Niedermayer
b0635e2fcf movtextenc: fix pointer messup and out of array accesses 
Fixes Ticket2187

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 21:54:02 +01:00
Michael Niedermayer
f7b7f021e5 Merge remote-tracking branch 'rdp/combined' 
* rdp/combined:
  hdyc col
  dshow: use standardized raw pixel format lookup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 21:00:53 +01:00
Michael Niedermayer
c2dd5a18b2 ljpegenc: allocate needed scratch-buffer 
Fixes null pointer dereference
Fixes Ticket2207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 18:52:07 +01:00
Michael Niedermayer
a8343bfb6a riff: fix infinite loop 
Fixes Ticket2241

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 18:31:27 +01:00
Diego Biurrun
70b348ec5b configure: Group all hwaccels together in a separate variable 2013-02-05 17:01:06 +01:00
Diego Biurrun
c9f933b5b6 Add av_cold attributes to arch-specific init functions 2013-02-05 17:01:05 +01:00
Michael Niedermayer
2b20397e1f libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:54:39 +01:00
multiple authors
81e357db62 libmpcodecs/vf_pullup: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:41:19 +01:00
multiple authors
13afcdd00e libmpcodecs/vf_uspp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:41:00 +01:00
multiple authors
3ce3d4cc3c libmpcodecs/vf_unsharp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:40:43 +01:00
multiple authors
7a4885600f libmpcodecs/vf_spp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:53:53 +01:00
multiple authors
14132599a3 libmpcodecs/vf_sab: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:47:33 +01:00
multiple authors
fe8bc6ddfc libmpcodecs/pullup: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:47:13 +01:00
multiple authors
8f7e3e678b libmpcodecs/vf_noise: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:18:15 +01:00
multiple authors
3ca46d0c10 libmpcodecs/vf_pp7:update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:17:28 +01:00