ffmpeg.git
5 years ago4xm: check for invalid zero ac coeffs
Michael Niedermayer [Sat, 29 Jun 2013 23:28:25 +0000 (01:28 +0200)]
4xm: check for invalid zero ac coeffs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomjpeg_decode_dc: check code before using it in get_xbits()
Michael Niedermayer [Sat, 29 Jun 2013 23:01:24 +0000 (01:01 +0200)]
mjpeg_decode_dc: check code before using it in get_xbits()

Fixes undefined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Don't include colorspace.h
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
ffmpeg: Don't include colorspace.h

The header is private, and ffmpeg.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoget_pix_fmt_score: favor equal formats if all else equal
Michael Niedermayer [Sat, 29 Jun 2013 20:20:20 +0000 (22:20 +0200)]
get_pix_fmt_score: favor equal formats if all else equal

Fixes Ticket2578

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoupdate all trac links to use the trac subdomain
Michael Niedermayer [Sat, 29 Jun 2013 17:27:49 +0000 (19:27 +0200)]
update all trac links to use the trac subdomain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 29 Jun 2013 16:27:52 +0000 (18:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdded codec ID to playback DNxHD
Reuben Martin [Sat, 29 Jun 2013 02:11:53 +0000 (21:11 -0500)]
Added codec ID to playback DNxHD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAvoid a null pointer dereference on clean-up after oom in ac3 encoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 15:50:07 +0000 (17:50 +0200)]
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

5 years agoAvoid a null pointer dereference on oom when decoding smacker.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:04:07 +0000 (16:04 +0200)]
Avoid a null pointer dereference on oom when decoding smacker.

Fixes ticket #2728.

5 years agoPropagate error return values from the smacker decoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:02:43 +0000 (16:02 +0200)]
Propagate error return values from the smacker decoder.

5 years agoAvoid a null pointer dereference on oom when decoding vc1.
Carl Eugen Hoyos [Sat, 29 Jun 2013 12:49:47 +0000 (14:49 +0200)]
Avoid a null pointer dereference on oom when decoding vc1.

Fixes ticket #2723.

5 years agodoc/muxers: apply various minor fixes to segment documentation
Stefano Sabatini [Sat, 29 Jun 2013 12:09:47 +0000 (14:09 +0200)]
doc/muxers: apply various minor fixes to segment documentation

5 years agodoc/muxers: sort muxers by name
Stefano Sabatini [Sat, 29 Jun 2013 11:53:58 +0000 (13:53 +0200)]
doc/muxers: sort muxers by name

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Jun 2013 10:03:59 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmapro: check num_vec_coeffs against the actual available buffer

Conflicts:
libavcodec/wmaprodec.c

The check is replaced by an assert.

See: b21ba20cc83c80fe56192fee3626a8087f37d806

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6652338f43ef623045912d7f28b61adea05d27ae'
Michael Niedermayer [Sat, 29 Jun 2013 09:37:38 +0000 (11:37 +0200)]
Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'

* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'
Michael Niedermayer [Sat, 29 Jun 2013 09:19:37 +0000 (11:19 +0200)]
Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'

* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
  wmapro: make sure there is room to store the current packet

The check is replaced by an assert as it is impossible to occur
See: 780d45473c32fa356c8ce385c3ea4692567c3228

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'afe03092dd693d025d43e1620283d8d285c92772'
Michael Niedermayer [Sat, 29 Jun 2013 08:58:52 +0000 (10:58 +0200)]
Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'

* commit 'afe03092dd693d025d43e1620283d8d285c92772':
  lavc: move put_bits_left in put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: make av_register_*put_format() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:44:15 +0000 (03:44 +0200)]
avformat: make av_register_*put_format() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:39:03 +0000 (03:39 +0200)]
avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/parser: Make av_register_codec_parser() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:24:32 +0000 (03:24 +0200)]
avcodec/parser: Make av_register_codec_parser() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Make av_register_hwaccel() and avcodec_register() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:11:48 +0000 (03:11 +0200)]
avcodec: Make av_register_hwaccel() and avcodec_register() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocosmetics: Fix "dont" "wont" "doesnt" typos
Timothy Gu [Sat, 29 Jun 2013 00:24:26 +0000 (17:24 -0700)]
cosmetics: Fix "dont" "wont" "doesnt" typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflac_parser.c: fix case when final frame is a false positive
Michael Chinen [Fri, 28 Jun 2013 05:16:39 +0000 (14:16 +0900)]
flac_parser.c: fix case when final frame is a false positive

Should fix https://ffmpeg.org/trac/ffmpeg/ticket/2552
Only did minimal testing on a few files and fate.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoudp: Fix receiving large udp packets
Michael Niedermayer [Fri, 28 Jun 2013 21:58:13 +0000 (23:58 +0200)]
udp: Fix receiving large udp packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotak_parser: properly mark packets as key frames
Paul B Mahol [Fri, 28 Jun 2013 21:21:57 +0000 (21:21 +0000)]
tak_parser: properly mark packets as key frames

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoDo not list libshine like a main option in configure's output.
Carl Eugen Hoyos [Fri, 28 Jun 2013 14:23:39 +0000 (16:23 +0200)]
Do not list libshine like a main option in configure's output.

It is listed as an enabled external library if applicable.

5 years agowmapro: check num_vec_coeffs against the actual available buffer
Luca Barbato [Fri, 28 Jun 2013 03:23:21 +0000 (05:23 +0200)]
wmapro: check num_vec_coeffs against the actual available buffer

Prevent yet another buffer overwrite.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agowmapro: return early on unsupported condition
Luca Barbato [Fri, 28 Jun 2013 03:21:33 +0000 (05:21 +0200)]
wmapro: return early on unsupported condition

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agowmapro: make sure there is room to store the current packet
Luca Barbato [Fri, 28 Jun 2013 02:03:47 +0000 (04:03 +0200)]
wmapro: make sure there is room to store the current packet

Prevent horrid and hard to trace struct overwrite.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agolavc: move put_bits_left in put_bits.h
Luca Barbato [Fri, 28 Jun 2013 01:40:35 +0000 (03:40 +0200)]
lavc: move put_bits_left in put_bits.h

5 years agodoc/decoders: document libopus decoder
Timothy Gu [Fri, 28 Jun 2013 02:07:32 +0000 (19:07 -0700)]
doc/decoders: document libopus decoder

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/encoders: alphabetically list the encoders
Timothy Gu [Fri, 28 Jun 2013 01:50:54 +0000 (18:50 -0700)]
doc/encoders: alphabetically list the encoders

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoavfilter/avfilter: Make avfilter_register() thread safe
Michael Niedermayer [Fri, 28 Jun 2013 10:39:26 +0000 (12:39 +0200)]
avfilter/avfilter: Make avfilter_register() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 28 Jun 2013 08:14:12 +0000 (10:14 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference in avcodec_decode_video2().
  Set block_align when reading QDM2 in mov.
  Fix muxing QDM2 mono into caf.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Jun 2013 08:08:43 +0000 (10:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: return meaningful errors

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d8629aac13692447b54eac795bf74007ebf8987'
Michael Niedermayer [Fri, 28 Jun 2013 08:00:51 +0000 (10:00 +0200)]
Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'

* commit '6d8629aac13692447b54eac795bf74007ebf8987':
  aac: K&R formatting cosmetics

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAvoid a null pointer dereference in avcodec_decode_video2().
Carl Eugen Hoyos [Thu, 27 Jun 2013 12:03:16 +0000 (14:03 +0200)]
Avoid a null pointer dereference in avcodec_decode_video2().

This could happen if oom occured while probing a file.
Reported in ticket #1900.

5 years agoSet block_align when reading QDM2 in mov.
Carl Eugen Hoyos [Thu, 27 Jun 2013 11:58:30 +0000 (13:58 +0200)]
Set block_align when reading QDM2 in mov.

Fixes ticket #2718.

5 years agoFix muxing QDM2 mono into caf.
Carl Eugen Hoyos [Thu, 27 Jun 2013 09:09:02 +0000 (11:09 +0200)]
Fix muxing QDM2 mono into caf.

5 years agoavfilter/vf_mp: preserve pixel format when possible
Michael Niedermayer [Fri, 28 Jun 2013 01:27:39 +0000 (03:27 +0200)]
avfilter/vf_mp:  preserve pixel format when possible

Fixes Ticket2577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogxf: Added codec ID to playback AVCHD
Reuben Martin [Tue, 18 Jun 2013 00:09:34 +0000 (19:09 -0500)]
gxf: Added codec ID to playback AVCHD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()
Stefano Sabatini [Thu, 27 Jun 2013 11:05:41 +0000 (13:05 +0200)]
lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()

Also improve error feedback while at it.

5 years agoAdded GXF format code to identify AVC Intra video streams. This was an extension...
Reuben Martin [Thu, 13 Jun 2013 03:21:35 +0000 (22:21 -0500)]
Added GXF format code to identify AVC Intra video streams. This was an extension to the origional GXF spec implemented by Grass Valley.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogxf: Factorize code in get_sindex()
Reuben Martin [Mon, 17 Jun 2013 20:22:46 +0000 (15:22 -0500)]
gxf: Factorize code in get_sindex()

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agogxf: Added GXF format code 25 which is used for DV codec in HD resolutions
Reuben Martin [Mon, 17 Jun 2013 20:22:46 +0000 (15:22 -0500)]
gxf: Added GXF format code 25 which is used for DV codec in HD resolutions

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix copying extradata to codec in mxfdec.c
Nigel Touati-Evans [Thu, 27 Jun 2013 11:28:43 +0000 (12:28 +0100)]
Fix copying extradata to codec in mxfdec.c

The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.
Attached it a patch to correct this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 27 Jun 2013 00:01:38 +0000 (02:01 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify and fix flushing out old subtitles on seeking

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaac: return meaningful errors
Luca Barbato [Mon, 6 May 2013 23:29:36 +0000 (01:29 +0200)]
aac: return meaningful errors

5 years agoaac: K&R formatting cosmetics
Luca Barbato [Wed, 26 Jun 2013 23:22:06 +0000 (01:22 +0200)]
aac: K&R formatting cosmetics

5 years agoffprobe: always exit 1 in case of errors
Stefano Sabatini [Wed, 26 Jun 2013 22:13:41 +0000 (00:13 +0200)]
ffprobe: always exit 1 in case of errors

This is consistent with the other ff* tools, and also avoids spurious
success reports when ret%256 = 0.

5 years agoffprobe: reindent after previous commit
Stefano Sabatini [Wed, 26 Jun 2013 22:11:21 +0000 (00:11 +0200)]
ffprobe: reindent after previous commit

5 years agoffprobe: fix exit code with stream specifiers
Nicolas George [Wed, 26 Jun 2013 13:17:27 +0000 (15:17 +0200)]
ffprobe: fix exit code with stream specifiers

Without this fix, ffprobe would exit with a failure exit code if a stream
specifier is given that selects the last stream.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
5 years agoffprobe: simplify branching logic in probe_file()
Stefano Sabatini [Wed, 26 Jun 2013 22:09:49 +0000 (00:09 +0200)]
ffprobe: simplify branching logic in probe_file()

5 years agoexamples/muxing: rename audio/video_pts to audio/video_time
Stefano Sabatini [Tue, 25 Jun 2013 19:17:05 +0000 (21:17 +0200)]
examples/muxing: rename audio/video_pts to audio/video_time

The new name is less confusing, since the variables represent times
rather than timestamps.

5 years agodoc/bitstream_filters: document the chomp filter
Stefano Sabatini [Wed, 26 Jun 2013 16:58:55 +0000 (18:58 +0200)]
doc/bitstream_filters: document the chomp filter

TODO: add some meaningful examples.

5 years agodoc/bitstream-filters.texi: add documentation for the aac_adtstoasc filter
Stefano Sabatini [Wed, 26 Jun 2013 16:07:17 +0000 (18:07 +0200)]
doc/bitstream-filters.texi: add documentation for the aac_adtstoasc filter

Based on the notes in libavcodec/aac_adtstoasc_bsf.c.

5 years agolavf/movenc: improve error feedback in case malformed AAC bitstream is detected
Stefano Sabatini [Wed, 26 Jun 2013 15:59:38 +0000 (17:59 +0200)]
lavf/movenc: improve error feedback in case malformed AAC bitstream is detected

Consistent with the FLV muxer.

5 years agolavf/mux: rename variable cortag -> tagbuf2 in init_muxer()
Stefano Sabatini [Wed, 26 Jun 2013 15:13:06 +0000 (17:13 +0200)]
lavf/mux: rename variable cortag -> tagbuf2 in init_muxer()

Possibly enhance readibility.

5 years agolavc/utils: improve feedback in case of invalid packet size
Stefano Sabatini [Wed, 26 Jun 2013 15:05:57 +0000 (17:05 +0200)]
lavc/utils: improve feedback in case of invalid packet size

5 years agoexamples/Makefile: disable -O2 optimizations
Stefano Sabatini [Wed, 26 Jun 2013 14:13:58 +0000 (16:13 +0200)]
examples/Makefile: disable -O2 optimizations

There is no much point in optimizing example code, and the -O2 flag is
annoying when debugging.

5 years agoexamples/muxing: remove useless instruction
Stefano Sabatini [Tue, 25 Jun 2013 22:03:15 +0000 (00:03 +0200)]
examples/muxing: remove useless instruction

Simpler and less confusing.

5 years agoffplay: simplify and fix flushing out old subtitles on seeking
Marton Balint [Sun, 16 Jun 2013 12:13:28 +0000 (14:13 +0200)]
ffplay: simplify and fix flushing out old subtitles on seeking

Fixes the additional issue reported in ticket #2666.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agodoc/filters: Fix texi syntax
Jean Delvare [Wed, 26 Jun 2013 13:50:55 +0000 (15:50 +0200)]
doc/filters: Fix texi syntax

Commit f1efaf837117718e3b4c96336fe9b5f686b1fe30 used parentheses
instead of curly braces in texi syntax, resulting in warnings when
the documentation is generated. Fix that.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: Fix PAL8 input with alpha
Michael Niedermayer [Wed, 26 Jun 2013 13:07:13 +0000 (15:07 +0200)]
swscale: Fix PAL8 input with alpha

Fixes Ticket2158

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/src_movie: Fix handling of packet size for video
Michael Niedermayer [Wed, 26 Jun 2013 11:32:55 +0000 (13:32 +0200)]
avfilter/src_movie: Fix handling of packet size for video

See Ticket2556

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavfilter/src_movie: fix which packet is reset
Michael Niedermayer [Wed, 26 Jun 2013 11:06:11 +0000 (13:06 +0200)]
libavfilter/src_movie: fix which packet is reset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRequire pthreads for compilation with OpenCL support.
Carl Eugen Hoyos [Wed, 26 Jun 2013 07:42:47 +0000 (09:42 +0200)]
Require pthreads for compilation with OpenCL support.

Fixes a part of ticket #2422.

Reviewed-by: James Almer
5 years agoUse AV_RN32 for an unaligned read in the mxg demuxer.
Carl Eugen Hoyos [Wed, 26 Jun 2013 07:33:44 +0000 (09:33 +0200)]
Use AV_RN32 for an unaligned read in the mxg demuxer.

Fixes ticket #2707.

5 years agolavf: silence max_analyze_duration warning
wm4 [Tue, 25 Jun 2013 23:17:27 +0000 (01:17 +0200)]
lavf: silence max_analyze_duration warning

This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."

Since this message is most likely useful for debugging only, raise the
log level accordingly.

Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cllc: Fix clobbered ff_get_buffer() change
Michael Niedermayer [Tue, 25 Jun 2013 23:16:09 +0000 (01:16 +0200)]
avcodec/cllc: Fix clobbered ff_get_buffer() change

Issue-since: 9328ae484338b70a7f2dbcd420bbbac499df76cc

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_drawbox: give all v_log() a context
Michael Niedermayer [Tue, 25 Jun 2013 22:53:32 +0000 (00:53 +0200)]
vf_drawbox: give all v_log() a context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_drawbox: avoid declaration in for() arguments
Michael Niedermayer [Tue, 25 Jun 2013 22:52:16 +0000 (00:52 +0200)]
vf_drawbox: avoid declaration in for() arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg
Michael Niedermayer [Tue, 25 Jun 2013 22:33:24 +0000 (00:33 +0200)]
Merge branch 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg

* 'drawbox_exprs' of https://github.com/mjmvisser/FFmpeg:
  enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples

Reviewed-by: Andrey Utkin
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoxa: abort if number of channels or sample rate is 0
Paul B Mahol [Tue, 25 Jun 2013 22:24:55 +0000 (22:24 +0000)]
xa: abort if number of channels or sample rate is 0

Fixes #2711.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolxfdec: remove wrong and unneeded check
Luca Barbato [Tue, 25 Jun 2013 19:13:06 +0000 (19:13 +0000)]
lxfdec: remove wrong and unneeded check

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoexamples/muxing: vertically align
Stefano Sabatini [Tue, 25 Jun 2013 19:09:03 +0000 (21:09 +0200)]
examples/muxing: vertically align

5 years agolavc/pngdec: return meaningful error codes
Stefano Sabatini [Tue, 25 Jun 2013 08:02:22 +0000 (10:02 +0200)]
lavc/pngdec: return meaningful error codes

5 years agoenabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added...
Mark Visser [Tue, 18 Jun 2013 14:30:26 +0000 (10:30 -0400)]
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples

5 years agolavfi/movie: free packet on decoder error
Michael Niedermayer [Tue, 25 Jun 2013 01:11:58 +0000 (03:11 +0200)]
lavfi/movie: free packet on decoder error

Prevents infinite loop, see Ticket2556

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 25 Jun 2013 09:34:38 +0000 (11:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Do not omit frame pointers for msvc/icl debug builds

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'
Michael Niedermayer [Tue, 25 Jun 2013 09:34:08 +0000 (11:34 +0200)]
Merge commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49'

* commit '9f4a16c52ea8f2383244587ea4cb534fe7f6da49':
  configure: Do not explicitly set Oy for msvc/icl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'
Michael Niedermayer [Tue, 25 Jun 2013 09:26:59 +0000 (11:26 +0200)]
Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'

* commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b':
  fate: Add Canopus Lossless YUY2 test

Conflicts:
tests/fate/lossless-video.mak
tests/ref/fate/cllc-yuy2-noblock

No change as the change is already in master

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Add Canopus Lossless YUY2 test
Derek Buitenhuis [Mon, 24 Jun 2013 22:38:54 +0000 (18:38 -0400)]
fate: Add Canopus Lossless YUY2 test

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'
Michael Niedermayer [Tue, 25 Jun 2013 08:51:19 +0000 (10:51 +0200)]
Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'

* commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22':
  cllc: Use outbuf in RGB and ARGB functions
  cllc: Implement YUV support

Conflicts:
libavcodec/cllc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b0ce601c160c87349d093d7e542b5c752754f598'
Michael Niedermayer [Tue, 25 Jun 2013 08:46:52 +0000 (10:46 +0200)]
Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

* commit 'b0ce601c160c87349d093d7e542b5c752754f598':
  doc/platform: Add info about ICL

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoyuv4mpeg: correctly handle chroma for odd luma sizes.
Ronald S. Bultje [Mon, 24 Jun 2013 23:13:58 +0000 (19:13 -0400)]
yuv4mpeg: correctly handle chroma for odd luma sizes.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoconfigure: Do not omit frame pointers for msvc/icl debug builds
Alex Smith [Mon, 24 Jun 2013 21:10:12 +0000 (21:10 +0000)]
configure: Do not omit frame pointers for msvc/icl debug builds

Because O1 or O2 are required to build libav with msvc/icl, this must be
explicitly set instead of just omitting Oy.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoconfigure: Do not explicitly set Oy for msvc/icl
Alex Smith [Mon, 24 Jun 2013 21:10:11 +0000 (21:10 +0000)]
configure: Do not explicitly set Oy for msvc/icl

It is implied by O1 or O2, both of which are required to build libav
with msvc/icl.  Silences warnings when targeting x64 with icl.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agofate: Add Canopus Lossless YUY2 test
Derek Buitenhuis [Mon, 24 Jun 2013 22:26:08 +0000 (18:26 -0400)]
fate: Add Canopus Lossless YUY2 test

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolavf/webvttdec: use private option to specify WebVTT kind
Matthew Heaney [Mon, 24 Jun 2013 18:20:32 +0000 (11:20 -0700)]
lavf/webvttdec: use private option to specify WebVTT kind

WebVTT subtitle tracks have four kinds. Certain downstream muxers
(such as for WebM) need to know which WebVTT kind this is, in order to
specify the codec id of the output track.

A new private input option, "-kind", has been added to the WebVTT
demuxer.  It accepts as a value any of "subtitles" (the default),
"captions", "descriptions", and "metadata".  The kind option value is
used to assign a value to the stream disposition flag, to which four
new values have been added, corresponding the four WebVTT kinds.

Signed-off-by: Matthew Heaney <matthewjheaney@google.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
5 years agolavf: add AV_DISPOSITION flags for WebVTT text track kinds
Matthew Heaney [Mon, 24 Jun 2013 18:18:05 +0000 (11:18 -0700)]
lavf: add AV_DISPOSITION flags for WebVTT text track kinds

There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.

To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.

5 years agocllc: Use outbuf in RGB and ARGB functions
Derek Buitenhuis [Mon, 24 Jun 2013 18:12:16 +0000 (14:12 -0400)]
cllc: Use outbuf in RGB and ARGB functions

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agocllc: Implement YUV support
Derek Buitenhuis [Sun, 23 Jun 2013 23:29:38 +0000 (19:29 -0400)]
cllc: Implement YUV support

Fixes ticket #1910.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavfilter/vsrc_testsrc: fix artifacts with odd height
Michael Niedermayer [Mon, 24 Jun 2013 21:21:17 +0000 (23:21 +0200)]
avfilter/vsrc_testsrc: fix artifacts with odd height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocllc: Use outbuf in RGB and ARGB functions
Derek Buitenhuis [Mon, 24 Jun 2013 18:12:16 +0000 (14:12 -0400)]
cllc: Use outbuf in RGB and ARGB functions

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agocllc: Implement YUV support
Derek Buitenhuis [Sun, 23 Jun 2013 23:29:38 +0000 (19:29 -0400)]
cllc: Implement YUV support

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agodoc/platform: Add info about ICL
Derek Buitenhuis [Sun, 23 Jun 2013 23:49:28 +0000 (19:49 -0400)]
doc/platform: Add info about ICL

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoh264: Fix null pointer dereference with disabled error concealment
Michael Niedermayer [Mon, 24 Jun 2013 14:05:19 +0000 (16:05 +0200)]
h264: Fix null pointer dereference with disabled error concealment

Fixes Ticket2551

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avio: Fix EOF handiling of ffurl_read_complete()
Michael Niedermayer [Mon, 24 Jun 2013 12:23:44 +0000 (14:23 +0200)]
avformat/avio: Fix EOF handiling of ffurl_read_complete()

Fixes Ticket2537

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Jun 2013 09:42:42 +0000 (11:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: don't abort if both encoder and muxer aspect ratios are not set

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>