ffmpeg.git
7 years agoffplay: only drop frames if not in frame step mode
Marton Balint [Wed, 26 Dec 2012 18:53:58 +0000 (19:53 +0100)]
ffplay: only drop frames if not in frame step mode

Fixes ticket #2053.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: move frame step pause from the video thread to video_refresh
Marton Balint [Tue, 25 Dec 2012 21:35:53 +0000 (22:35 +0100)]
ffplay: move frame step pause from the video thread to video_refresh

This way we pause the video right after we displayed a new frame. Partially
fixes ticket #2053.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoauenc: do not write invalid file size
Paul B Mahol [Fri, 28 Dec 2012 13:21:36 +0000 (13:21 +0000)]
auenc: do not write invalid file size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovf_divtc: dont mix av_strdup and free
Michael Niedermayer [Fri, 28 Dec 2012 16:05:19 +0000 (17:05 +0100)]
vf_divtc: dont mix av_strdup and free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_detc: dont mix av_strdup & free
Michael Niedermayer [Fri, 28 Dec 2012 16:04:54 +0000 (17:04 +0100)]
vf_detc: dont mix av_strdup & free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_mp: fix 'discards const qualifier from pointer target type'
Michael Niedermayer [Fri, 28 Dec 2012 16:00:01 +0000 (17:00 +0100)]
vf_mp: fix 'discards const qualifier from pointer target type'

args are not supposed to be changed by filters even if the argument is
not marked as const.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavutil/samplefmt: Fix project name
Michael Niedermayer [Fri, 28 Dec 2012 12:55:58 +0000 (13:55 +0100)]
libavutil/samplefmt: Fix project name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: s/mjpeg.c/mjpeg*.c/
Michael Niedermayer [Fri, 28 Dec 2012 11:56:24 +0000 (12:56 +0100)]
MAINTAINERS: s/mjpeg.c/mjpeg*.c/

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: add segment_frames option
Stefano Sabatini [Sun, 9 Dec 2012 19:26:30 +0000 (20:26 +0100)]
lavf/segment: add segment_frames option

This is meant to address trac ticket #1483.

7 years agolavf/segment: add reference_stream option
Stefano Sabatini [Sat, 22 Dec 2012 20:49:06 +0000 (21:49 +0100)]
lavf/segment: add reference_stream option

7 years agolibpostproc: alloc a few bytes more in the temporary buffer
Michael Niedermayer [Fri, 28 Dec 2012 01:47:25 +0000 (02:47 +0100)]
libpostproc: alloc a few bytes more in the temporary buffer

This avoids dering reading 4 bytes prior the buffer (1 byte can
be used)

Fixes Ticket2057

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibpostproc: Fix off by 1 error in the C dering code
Michael Niedermayer [Fri, 28 Dec 2012 00:48:40 +0000 (01:48 +0100)]
libpostproc: Fix off by 1 error in the C dering code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: Support 16bit DQT
Michael Niedermayer [Thu, 27 Dec 2012 22:16:54 +0000 (23:16 +0100)]
mjpegdec: Support 16bit DQT

Fixes Ticket2072

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: fix g723_1 decoder dependency
Paul B Mahol [Thu, 27 Dec 2012 18:20:54 +0000 (18:20 +0000)]
build: fix g723_1 decoder dependency

g723_1 decoder needs celp_math.o because it calls ff_dot_product().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agogifdec: fix transparent background color
Don Moir [Thu, 27 Dec 2012 18:06:49 +0000 (18:06 +0000)]
gifdec: fix transparent background color

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomjpegdec: reset restart_count on progressive scans
Michael Niedermayer [Thu, 27 Dec 2012 16:39:10 +0000 (17:39 +0100)]
mjpegdec: reset restart_count on progressive scans

Fixes Ticket2068

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/encoders: clarify the direction of the quality setting parameters for libtheora
Stefano Sabatini [Wed, 26 Dec 2012 23:56:47 +0000 (00:56 +0100)]
doc/encoders: clarify the direction of the quality setting parameters for libtheora

7 years agodoc/ffmpeg-formats: extend documentation for the probesize parameter
Stefano Sabatini [Wed, 26 Dec 2012 16:42:45 +0000 (17:42 +0100)]
doc/ffmpeg-formats: extend documentation for the probesize parameter

7 years agoffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate
Stefano Sabatini [Sat, 22 Dec 2012 23:19:11 +0000 (00:19 +0100)]
ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate

7 years agoMAINTAINERS: add libswresample
Michael Niedermayer [Thu, 27 Dec 2012 11:15:59 +0000 (12:15 +0100)]
MAINTAINERS: add libswresample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodocs: add soxr documentation
Rob Sykes [Thu, 27 Dec 2012 11:07:15 +0000 (12:07 +0100)]
docs: add soxr documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosoxr_resample: soxr API parameter rename
Rob Sykes [Thu, 27 Dec 2012 10:59:55 +0000 (11:59 +0100)]
soxr_resample: soxr API parameter rename

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosoxr_resample: Correct email address
Rob Sykes [Thu, 27 Dec 2012 10:57:32 +0000 (11:57 +0100)]
soxr_resample: Correct email address

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/tile: small align cosmetics.
Clément Bœsch [Wed, 26 Dec 2012 20:32:38 +0000 (21:32 +0100)]
lavfi/tile: small align cosmetics.

7 years agolavfi/tile: remove usage of link->{cur,out}_buf.
Clément Bœsch [Wed, 26 Dec 2012 19:19:30 +0000 (20:19 +0100)]
lavfi/tile: remove usage of link->{cur,out}_buf.

7 years agolavfi/scale: remove usage of link->cur_buf.
Clément Bœsch [Wed, 26 Dec 2012 19:00:10 +0000 (20:00 +0100)]
lavfi/scale: remove usage of link->cur_buf.

7 years agolavfi/deshake: remove usage of link->cur_buf.
Clément Bœsch [Wed, 26 Dec 2012 19:00:00 +0000 (20:00 +0100)]
lavfi/deshake: remove usage of link->cur_buf.

7 years agolavfi/decimate: remove usage of link->cur_buf.
Clément Bœsch [Wed, 26 Dec 2012 18:56:53 +0000 (19:56 +0100)]
lavfi/decimate: remove usage of link->cur_buf.

7 years agolavfi/video: remove unused ff_inplace_start_frame().
Clément Bœsch [Wed, 26 Dec 2012 18:29:44 +0000 (19:29 +0100)]
lavfi/video: remove unused ff_inplace_start_frame().

7 years agomjpegdec: handle the occurance of rstn emulation
Michael Niedermayer [Wed, 26 Dec 2012 19:23:09 +0000 (20:23 +0100)]
mjpegdec: handle the occurance of rstn emulation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: Handle RSTn in progressive jpegs
Michael Niedermayer [Tue, 25 Dec 2012 02:54:51 +0000 (03:54 +0100)]
mjpegdec: Handle RSTn in progressive jpegs

Fixes Ticket2003

Reviewed-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegdec: factor handle_rstn() out
Michael Niedermayer [Tue, 25 Dec 2012 02:54:25 +0000 (03:54 +0100)]
mjpegdec: factor handle_rstn() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: mp filter does not depend on postproc anymore
Paul B Mahol [Wed, 26 Dec 2012 18:48:26 +0000 (18:48 +0000)]
build: mp filter does not depend on postproc anymore

This fixes testprogs build target if libpostproc is disabled.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovf_idet: fix type of stats
Michael Niedermayer [Wed, 26 Dec 2012 02:22:26 +0000 (03:22 +0100)]
vf_idet: fix type of stats

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/idet: remove unused assert include.
Clément Bœsch [Wed, 26 Dec 2012 01:50:06 +0000 (02:50 +0100)]
lavfi/idet: remove unused assert include.

7 years agolavfi/idet: remove unecessary context assignment.
Clément Bœsch [Wed, 26 Dec 2012 01:48:07 +0000 (02:48 +0100)]
lavfi/idet: remove unecessary context assignment.

7 years agolavfi/idet: support named parameters.
Clément Bœsch [Wed, 26 Dec 2012 01:47:25 +0000 (02:47 +0100)]
lavfi/idet: support named parameters.

The parameters are currently not documented in doc/filters.texi, but now
they at least appear in the automatic help.

7 years agolavfi/idet: remove unecessary poll_frame callback.
Clément Bœsch [Wed, 26 Dec 2012 01:33:26 +0000 (02:33 +0100)]
lavfi/idet: remove unecessary poll_frame callback.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 26 Dec 2012 13:35:54 +0000 (14:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: initialize videodsp with correct pixel depth

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dsp: fix the warning fix, make it work with --disable-asm
Michael Niedermayer [Wed, 26 Dec 2012 13:23:54 +0000 (14:23 +0100)]
vc1dsp: fix the warning fix, make it work with --disable-asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/resampler: extend docs for min_comp and min_hard_comp options
Stefano Sabatini [Wed, 26 Dec 2012 00:39:08 +0000 (01:39 +0100)]
doc/resampler: extend docs for min_comp and min_hard_comp options

Based on the text from the aresample filter docs.

7 years agolavfi/aresample: fix style
Stefano Sabatini [Wed, 26 Dec 2012 00:26:55 +0000 (01:26 +0100)]
lavfi/aresample: fix style

Improve overall consistency/improve readability.

7 years agolibswscale/swscale-test: fix some const correctness
Michael Niedermayer [Wed, 26 Dec 2012 02:14:59 +0000 (03:14 +0100)]
libswscale/swscale-test: fix some const correctness

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dsp: fix pointer type warnings
Michael Niedermayer [Wed, 26 Dec 2012 02:00:35 +0000 (03:00 +0100)]
vc1dsp: fix pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/utils: fix 'warning: missing braces around initializer'
Michael Niedermayer [Wed, 26 Dec 2012 00:53:45 +0000 (01:53 +0100)]
lavc/utils: fix 'warning: missing braces around initializer'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolcldec: fix zlib const pointer warning
Michael Niedermayer [Wed, 26 Dec 2012 00:37:38 +0000 (01:37 +0100)]
lcldec: fix zlib const pointer warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: fix 2 "discards const qualifier from pointer target type"
Michael Niedermayer [Wed, 26 Dec 2012 00:36:00 +0000 (01:36 +0100)]
imgconvert: fix 2 "discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimgconvert: dont depend on default return type for get_color_type()
Michael Niedermayer [Wed, 26 Dec 2012 00:34:26 +0000 (01:34 +0100)]
imgconvert: dont depend on default return type for get_color_type()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_direct: silence several warning: assignment from incompatible pointer type"
Michael Niedermayer [Wed, 26 Dec 2012 00:23:19 +0000 (01:23 +0100)]
h264_direct: silence several warning: assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: initialize videodsp with correct pixel depth
Janne Grunau [Tue, 25 Dec 2012 23:24:21 +0000 (00:24 +0100)]
mpegvideo: initialize videodsp with correct pixel depth

Fixes decoding of 9/10 bit per pixel h264 videos as reported in
https://bugzilla.libav.org/show_bug.cgi?id=404 .

7 years agormdec: fix compiler warning for uninitialized variables
Jean First [Sat, 31 Dec 2011 13:15:35 +0000 (14:15 +0100)]
rmdec: fix compiler warning for uninitialized variables

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: update AVProgram after pmt change
XBMC [Sun, 16 Dec 2012 08:53:18 +0000 (09:53 +0100)]
mpegts: update AVProgram after pmt change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Rescale audio stream duration from EditRate to SampleRate
Tomas Härdin [Fri, 14 Dec 2012 14:39:16 +0000 (15:39 +0100)]
mxfdec: Rescale audio stream duration from EditRate to SampleRate

Since 83cab07 audio stream time bases are based on SampleRate, not EditRate.
This fixes trac ticket #2029 and a few seeking issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: use the new swr -async parameter instead of a set of parameters.
Michael Niedermayer [Sat, 22 Dec 2012 22:54:25 +0000 (23:54 +0100)]
ffmpeg: use the new swr -async parameter instead of a set of parameters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: support -async X as a simple way to do what ffmpeg -async X did
Michael Niedermayer [Sat, 22 Dec 2012 22:53:45 +0000 (23:53 +0100)]
swr: support -async X as a simple way to do what ffmpeg -async X did

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 25 Dec 2012 15:36:49 +0000 (16:36 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix greenish line on the right edge with some xv sizes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_pp: add postproc to the library dependencys for avfilter when enabled.
Hendrik Leppkes [Tue, 25 Dec 2012 13:45:00 +0000 (14:45 +0100)]
vf_pp: add postproc to the library dependencys for avfilter when enabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix greenish line on the right edge with some xv sizes
Marton Balint [Thu, 6 Dec 2012 23:44:17 +0000 (00:44 +0100)]
ffplay: fix greenish line on the right edge with some xv sizes

If the XV image linesize was different from the width, SDL would create an
overlay wider than the actually requested one. This causes a greenish line on
the right, because the rightmost texel is blended with unset data.  This patch
introduces a function which duplicates the rightmost texel to the unset space,
that way the blending will be done with duplicated border texels.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agosrt_probe: make buffer pointer const
Michael Niedermayer [Tue, 25 Dec 2012 01:57:48 +0000 (02:57 +0100)]
srt_probe: make buffer pointer const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil_mmx: fix pointer type for emulated_edge_mc_func()
Michael Niedermayer [Tue, 25 Dec 2012 01:04:31 +0000 (02:04 +0100)]
dsputil_mmx: fix pointer type for emulated_edge_mc_func()

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agostr_probe: make buffer related pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:55:22 +0000 (01:55 +0100)]
str_probe: make buffer related pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopva_probe: make buffer related pointers and function arguments const
Michael Niedermayer [Tue, 25 Dec 2012 00:54:41 +0000 (01:54 +0100)]
pva_probe: make buffer related pointers and function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxf_probe: make buffer related pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:54:20 +0000 (01:54 +0100)]
mxf_probe: make buffer related pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc8_probe: make buffer related pointers and function arguments const
Michael Niedermayer [Tue, 25 Dec 2012 00:51:59 +0000 (01:51 +0100)]
mpc8_probe: make buffer related pointers and function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3_read_probe: make buffer related pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:51:32 +0000 (01:51 +0100)]
mp3_read_probe: make buffer related pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomicrodvd_probe: make buffer pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:50:58 +0000 (01:50 +0100)]
microdvd_probe: make buffer pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegps_probe: make buffer related pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:50:14 +0000 (01:50 +0100)]
mpegps_probe: make buffer related pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoloas_probe: make buffer pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:45:56 +0000 (01:45 +0100)]
loas_probe: make buffer pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolmlm4_probe: make buffer pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:45:21 +0000 (01:45 +0100)]
lmlm4_probe: make buffer pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoipmovie_probe: make buffer pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:44:59 +0000 (01:44 +0100)]
ipmovie_probe: make buffer pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflac_probe: make buffer pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:43:14 +0000 (01:43 +0100)]
flac_probe: make buffer pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3_eac3_probe: mark buffer pointers const
Michael Niedermayer [Tue, 25 Dec 2012 00:42:23 +0000 (01:42 +0100)]
ac3_eac3_probe: mark buffer pointers const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadts_aac_probe: mark buffer pointers as const
Michael Niedermayer [Tue, 25 Dec 2012 00:41:00 +0000 (01:41 +0100)]
adts_aac_probe: mark buffer pointers as const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggdec: fix warning: assignment discards qualifiers from pointer target type
Michael Niedermayer [Mon, 24 Dec 2012 21:37:24 +0000 (22:37 +0100)]
oggdec: fix warning: assignment discards qualifiers from pointer target type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfiltergraph: put variables used in #if 0 code themselfs under #if 0
Michael Niedermayer [Mon, 24 Dec 2012 21:35:27 +0000 (22:35 +0100)]
avfiltergraph: put variables used in #if 0 code themselfs under #if 0

Fixes unused variable warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomcdec: suppress "warning: a/vst may be used uninitialized in this function"
Michael Niedermayer [Mon, 24 Dec 2012 17:21:46 +0000 (18:21 +0100)]
mcdec: suppress "warning: a/vst may be used uninitialized in this function"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mpeg: suppress warning: lpcm_header_len may be used uninitialized in this function
Michael Niedermayer [Mon, 24 Dec 2012 17:18:03 +0000 (18:18 +0100)]
lavf/mpeg: suppress warning: lpcm_header_len may be used uninitialized in this function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Dec 2012 15:13:06 +0000 (16:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wnv1: cosmetics, reformat
  xan: remove a trivially true if().
  ansi: do not depend on get_buffer() initializing the frame.
  zerocodec: remove an unused variable.
  zmbv: remove some pointless comments and empty lines

Conflicts:
libavcodec/xan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'
Michael Niedermayer [Mon, 24 Dec 2012 14:42:52 +0000 (15:42 +0100)]
Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
libavcodec/bmp.c
tests/ref/fate/yop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
Michael Niedermayer [Mon, 24 Dec 2012 14:29:15 +0000 (15:29 +0100)]
Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'

* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
  hlsenc: Allocate enough space for the pattern string
  lavc: Correct the description of pkt_dts
  avfilter: Compile FIFO filters unconditionally

Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'
Michael Niedermayer [Mon, 24 Dec 2012 14:09:58 +0000 (15:09 +0100)]
Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'

* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
configure
libavcodec/pictordec.c
libavformat/anm.c
libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'
Michael Niedermayer [Mon, 24 Dec 2012 13:43:03 +0000 (14:43 +0100)]
Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'

* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
  oggdec: K&R cosmetic formatting
  hlsenc: correctly report target duration

Conflicts:
libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agownv1: cosmetics, reformat
Anton Khirnov [Fri, 16 Nov 2012 17:42:16 +0000 (18:42 +0100)]
wnv1: cosmetics, reformat

7 years agoxan: remove a trivially true if().
Anton Khirnov [Fri, 16 Nov 2012 05:40:14 +0000 (06:40 +0100)]
xan: remove a trivially true if().

This function used to be shared with the xxan decoder, but that is not
true anymore.

7 years agoansi: do not depend on get_buffer() initializing the frame.
Anton Khirnov [Thu, 15 Nov 2012 13:24:51 +0000 (14:24 +0100)]
ansi: do not depend on get_buffer() initializing the frame.

The background changes from 128 (used by the default/cmdutils
get_buffer()) to 0. This looks more correct.

7 years agozerocodec: remove an unused variable.
Anton Khirnov [Thu, 15 Nov 2012 19:42:22 +0000 (20:42 +0100)]
zerocodec: remove an unused variable.

7 years agozmbv: remove some pointless comments and empty lines
Anton Khirnov [Thu, 15 Nov 2012 17:24:29 +0000 (18:24 +0100)]
zmbv: remove some pointless comments and empty lines

7 years agoyop: simplify/sanitize the decoding loop
Anton Khirnov [Thu, 15 Nov 2012 21:03:00 +0000 (22:03 +0100)]
yop: simplify/sanitize the decoding loop

Do not overwrite linesize set by get_buffer().

The last frame in the FATE test is not decoded anymore, since the file
is cut and a part of it is missing.

7 years agoc93: set palette_has_changed.
Anton Khirnov [Thu, 15 Nov 2012 09:38:38 +0000 (10:38 +0100)]
c93: set palette_has_changed.

7 years agobmp: cosmetics, reformat
Anton Khirnov [Thu, 15 Nov 2012 08:23:55 +0000 (09:23 +0100)]
bmp: cosmetics, reformat

7 years agotiffdec: Fix runend handling
Michael Niedermayer [Mon, 24 Dec 2012 03:35:12 +0000 (04:35 +0100)]
tiffdec: Fix runend handling

Fixes Ticket1999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorl2: return EOF on EOF
Michael Niedermayer [Mon, 24 Dec 2012 01:51:51 +0000 (02:51 +0100)]
rl2: return EOF on EOF

Fixes Ticket1947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: reword H264-MT entry
Michael Niedermayer [Mon, 24 Dec 2012 00:45:20 +0000 (01:45 +0100)]
Changelog: reword H264-MT entry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: remove outdated comments
Stefano Sabatini [Mon, 24 Dec 2012 00:15:22 +0000 (01:15 +0100)]
doc/filters: remove outdated comments

Audio API should not be considered unstable any longer, and mentioning
VHOOK is confusing, as it was removed 4 years ago.

7 years agolavc/pthread: do not re-define _GNU_SOURCE if already defined.
Clément Bœsch [Sun, 23 Dec 2012 21:50:44 +0000 (22:50 +0100)]
lavc/pthread: do not re-define _GNU_SOURCE if already defined.

This fixes the following warning with GCC:
    libavcodec/pthread.c:35:0: warning: _GNU_SOURCE redefined [enabled by default]
    <command-line>::0: note: this is the location of the previous definition

The reason of the presence of this flag is:
    % pkg-config --cflags sdl
    -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL

7 years agodoc: stop generating syntax.html.
Clément Bœsch [Sun, 23 Dec 2012 20:29:00 +0000 (21:29 +0100)]
doc: stop generating syntax.html.

Just like doc/eval.texi, this file is meant to be included from
ffmpeg-utils.texi, and not to be used as a standalone documentation.

7 years agohlsenc: Don't duplicate a string constant
Martin Storsjö [Sun, 23 Dec 2012 19:34:06 +0000 (21:34 +0200)]
hlsenc: Don't duplicate a string constant

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohlsenc: Allocate enough space for the pattern string
Stefano Sabatini [Thu, 20 Dec 2012 23:27:00 +0000 (00:27 +0100)]
hlsenc: Allocate enough space for the pattern string

If s->filename doesn't contain any period/filename extension to strip
away, the buffer will be too small to fit both strings. This isn't
any buffer overflow since the concatenation uses av_strlcat with
the right buffer size.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoNIST SPHERE demuxer
Paul B Mahol [Tue, 18 Dec 2012 20:38:49 +0000 (20:38 +0000)]
NIST SPHERE demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoalsdec: improve warning message when invalid channel position is found
Paul B Mahol [Sat, 22 Dec 2012 12:01:57 +0000 (12:01 +0000)]
alsdec: improve warning message when invalid channel position is found

Signed-off-by: Paul B Mahol <onemda@gmail.com>