]> git.sesse.net Git - ffmpeg/log
ffmpeg
10 years agoMerge commit '70a7b24d56a823894440a372c46e89e212b89c35'
Michael Niedermayer [Sat, 14 Dec 2013 10:13:51 +0000 (11:13 +0100)]
Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

* commit '70a7b24d56a823894440a372c46e89e212b89c35':
  avutil: Add deprecation ifdefs around obsolete intfloat code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/vc1: Factorize imode enum out / remove duplication
Michael Niedermayer [Sat, 14 Dec 2013 04:16:25 +0000 (05:16 +0100)]
avcodec/vc1: Factorize imode enum out / remove duplication

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agohevc: rename ptl structs and variables
Guillaume Martres [Fri, 13 Dec 2013 19:05:26 +0000 (20:05 +0100)]
hevc: rename ptl structs and variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agohevc: pack PTL representation using uint8_t
Guillaume Martres [Fri, 13 Dec 2013 19:05:25 +0000 (20:05 +0100)]
hevc: pack PTL representation using uint8_t

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agohevc: remove unused PTL flags
Guillaume Martres [Fri, 13 Dec 2013 19:05:24 +0000 (20:05 +0100)]
hevc: remove unused PTL flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agohevc: don't check for errors in PTL code
Guillaume Martres [Fri, 13 Dec 2013 19:05:23 +0000 (20:05 +0100)]
hevc: don't check for errors in PTL code

The value of XXX_reserved_zero_44bits should be ignored, no need to
report an error when it's not zero.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agohevc: fix PTL parsing
Guillaume Martres [Fri, 13 Dec 2013 19:05:22 +0000 (20:05 +0100)]
hevc: fix PTL parsing

This was broken in commit 36658c978f5d7df2ce556075946f3a80f7eca753

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoswscale/x86/rgb2rgb: Make sure COMPILE_TEMPLATE_AVX is defined
Michael Niedermayer [Sat, 14 Dec 2013 01:54:28 +0000 (02:54 +0100)]
swscale/x86/rgb2rgb: Make sure COMPILE_TEMPLATE_AVX is defined

Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoswscale/x86/rgb2rgb_template: try to fix build without AVX
Michael Niedermayer [Sat, 14 Dec 2013 01:22:44 +0000 (02:22 +0100)]
swscale/x86/rgb2rgb_template: try to fix build without AVX

Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/vc1dec: propagate errors from vc1_parse_sprites()
Michael Niedermayer [Sat, 14 Dec 2013 00:07:34 +0000 (01:07 +0100)]
avcodec/vc1dec: propagate errors from vc1_parse_sprites()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/vc1dec: zero SpriteData struct
Michael Niedermayer [Fri, 13 Dec 2013 23:58:18 +0000 (00:58 +0100)]
avcodec/vc1dec: zero SpriteData struct

Fixes use of uninitialized data, as alternative alpha could be
calculated conditionally

Fixes part of msan_uninit-mem_7f51a8b0b3b0_1009_Arlington.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/vc1dec: dont calculate unused values from uninitialized sprites
Michael Niedermayer [Fri, 13 Dec 2013 23:58:18 +0000 (00:58 +0100)]
avcodec/vc1dec: dont calculate unused values from uninitialized sprites

Fixes use of uninitialized data
Fixes part of msan_uninit-mem_7f51a8b0b3b0_1009_Arlington.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavutil: Add deprecation ifdefs around obsolete intfloat code
Diego Biurrun [Fri, 13 Dec 2013 12:34:07 +0000 (13:34 +0100)]
avutil: Add deprecation ifdefs around obsolete intfloat code

This long-deprecated code should disappear at the next version bump.

10 years agoavformat/asf: clear uninitialized areas of packets before returning them
Michael Niedermayer [Fri, 13 Dec 2013 21:31:49 +0000 (22:31 +0100)]
avformat/asf: clear uninitialized areas of packets before returning them

Fixes use of uninitialized variables
Fixes msan_uninit-mem_7f839282b6ce_7273_msn08_VBRq70_800x600.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 13 Dec 2013 20:33:13 +0000 (21:33 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Merge pthreads/w32threads OBJS declarations

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '7c3388711b7243d059db39aa04b754baf2156934'
Michael Niedermayer [Fri, 13 Dec 2013 20:26:06 +0000 (21:26 +0100)]
Merge commit '7c3388711b7243d059db39aa04b754baf2156934'

* commit '7c3388711b7243d059db39aa04b754baf2156934':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'
Michael Niedermayer [Fri, 13 Dec 2013 19:49:09 +0000 (20:49 +0100)]
Merge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'

* commit 'bdc111a162094c14660d1e88839d103a4d79e42a':
  configure: Detect newer (>=4.1) versions of MinGW32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd'
Michael Niedermayer [Fri, 13 Dec 2013 19:34:40 +0000 (20:34 +0100)]
Merge commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd'

* commit 'a1d7d5524799bd90bc5d12e8b3063238cc0c02dd':
  build: Do not add -g to HOSTCFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoconfigure: remove redundant definition of __USE_MINGW_ANSI_STDIO
James Almer [Fri, 13 Dec 2013 19:14:20 +0000 (16:14 -0300)]
configure: remove redundant definition of __USE_MINGW_ANSI_STDIO

No need to define it twice on mingw-w64 >= v3.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
10 years agoavcodec/mjpegdec: use mallocz for progressive blocks
Michael Niedermayer [Fri, 13 Dec 2013 19:25:38 +0000 (20:25 +0100)]
avcodec/mjpegdec: use mallocz for progressive blocks

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f849c599487_6828_mjpeg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/ipmovie: Fix use of uninitialized memory in OPCODE_INIT_VIDEO_BUFFERS
Michael Niedermayer [Fri, 13 Dec 2013 18:50:34 +0000 (19:50 +0100)]
avformat/ipmovie: Fix use of uninitialized memory in OPCODE_INIT_VIDEO_BUFFERS

Fixes: msan_uninit-mem_7ffe323a25f3_5929_ipmovie_interplayvideo_interplay_dpcm__bislogo.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/network: check ff_socket_nonblock() return and print a debug message
Michael Niedermayer [Mon, 21 Oct 2013 15:23:35 +0000 (17:23 +0200)]
avformat/network: check ff_socket_nonblock() return and print a debug message

Fixes CID1026744
Fixes CID1026743

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolibavcodec/dvbsub: fix for Display Definition Segment
Pierre Yves MORDRET [Fri, 13 Dec 2013 13:29:09 +0000 (14:29 +0100)]
libavcodec/dvbsub: fix for Display Definition Segment

Given ETSI EN 300 743 V1.3.1 (2006-11), 7.2.1 Display definition segment
display window parameters are given in this order XMin, XMax, YMin, YMax
if  display_window_flag is set, but here this is not the case.
As a consequence the DVB subtitles are not displayed upon some videos.

Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agobuild: Merge pthreads/w32threads OBJS declarations
Diego Biurrun [Thu, 12 Dec 2013 15:27:30 +0000 (16:27 +0100)]
build: Merge pthreads/w32threads OBJS declarations

10 years agoconfigure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32
Diego Biurrun [Wed, 11 Dec 2013 23:39:43 +0000 (00:39 +0100)]
configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW32

This enables a more C99-compliant implementation of printf et al.

10 years agoconfigure: Detect newer (>=4.1) versions of MinGW32
Diego Biurrun [Wed, 11 Dec 2013 23:34:43 +0000 (00:34 +0100)]
configure: Detect newer (>=4.1) versions of MinGW32

The MinGW32 project is deprecating its old version macros.

10 years agobuild: Do not add -g to HOSTCFLAGS
Diego Biurrun [Wed, 11 Dec 2013 23:04:27 +0000 (00:04 +0100)]
build: Do not add -g to HOSTCFLAGS

The flag is not unconditionally added to CFLAGS either and the
programs built on the host do not get habitually fed to a debugger.

10 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 13 Dec 2013 14:44:39 +0000 (15:44 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force one stream in caf muxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavfilter/vf_pullup: fix memleak on error
Michael Niedermayer [Fri, 13 Dec 2013 14:14:03 +0000 (15:14 +0100)]
avfilter/vf_pullup: fix memleak on error

Fixes CID1108604

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavfilter/vf_pullup: Factor free_field_queue() out
Michael Niedermayer [Fri, 13 Dec 2013 14:13:01 +0000 (15:13 +0100)]
avfilter/vf_pullup: Factor free_field_queue() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoForce one stream in caf muxer.
Carl Eugen Hoyos [Fri, 13 Dec 2013 10:57:39 +0000 (11:57 +0100)]
Force one stream in caf muxer.

Based on eeb975f5

10 years agoexamples/demuxing_decoding: print the decoding error when it happens.
Clément Bœsch [Fri, 13 Dec 2013 09:36:52 +0000 (10:36 +0100)]
examples/demuxing_decoding: print the decoding error when it happens.

10 years agoexamples/demuxing_decoding: return error when no codec found
Even Wiik Thomassen [Fri, 13 Dec 2013 08:24:18 +0000 (09:24 +0100)]
examples/demuxing_decoding: return error when no codec found

The open_codec_context function, when it fails to find a codec, now
return AVERROR(EINVAL) to signal an error.

Before it would return the stream index, which was always >= 0, and
continue as if a codec was found. This change make it fail faster,
instead of repeated failed tries to decode frames with no codec.

Signed-off-by: Even Wiik Thomassen <e.thomassen@sportradar.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
10 years agoffprobe: add cosmetical empty line
Stefano Sabatini [Thu, 12 Dec 2013 23:18:04 +0000 (00:18 +0100)]
ffprobe: add cosmetical empty line

10 years agoffserver: improve error feedback in case of av_write_frame() error
Stefano Sabatini [Tue, 10 Dec 2013 19:11:28 +0000 (20:11 +0100)]
ffserver: improve error feedback in case of av_write_frame() error

10 years agoMAINTAINERS: remove ffserver maintainership status notice
Stefano Sabatini [Wed, 27 Nov 2013 13:29:19 +0000 (14:29 +0100)]
MAINTAINERS: remove ffserver maintainership status notice

Privately approved by Baptiste.

10 years agodocs/outdevs: add a few simple ALSA examples
Lou Logan [Tue, 10 Dec 2013 23:49:26 +0000 (14:49 -0900)]
docs/outdevs: add a few simple ALSA examples

10 years agoavformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference
Michael Niedermayer [Fri, 13 Dec 2013 00:33:35 +0000 (01:33 +0100)]
avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference

Fixes CID1035715

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/rtpdec_h264: fix null pointer dereferences
Michael Niedermayer [Fri, 13 Dec 2013 00:27:26 +0000 (01:27 +0100)]
avformat/rtpdec_h264: fix null pointer dereferences

Fixes CID733716

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/sdp: fix memleak on error
Michael Niedermayer [Thu, 12 Dec 2013 23:27:25 +0000 (00:27 +0100)]
avformat/sdp: fix memleak on error

Fixes CID700640
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/hevc_sei: fix use of uninitialized variables in decode_nal_sei_frame_packing_...
Michael Niedermayer [Thu, 12 Dec 2013 22:51:39 +0000 (23:51 +0100)]
avcodec/hevc_sei: fix use of uninitialized variables in decode_nal_sei_frame_packing_arrangement()

Fixes CID1135773/1135774/1135775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolibavformat/hdsenc: check init_file() return code
Michael Niedermayer [Thu, 12 Dec 2013 20:04:24 +0000 (21:04 +0100)]
libavformat/hdsenc: check init_file() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 12 Dec 2013 19:05:52 +0000 (20:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegts: add HEVC registration descriptor

Conflicts:
libavformat/mpegts.c

See: d0b7d24b80b390b2013adc3c8e0e2063836ee293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
Michael Niedermayer [Thu, 12 Dec 2013 18:55:06 +0000 (19:55 +0100)]
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'

* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
  changelog: drop redundant new attribute

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'
Michael Niedermayer [Thu, 12 Dec 2013 18:48:36 +0000 (19:48 +0100)]
Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'

* commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a':
  img2: add stereo 3d still picture file extensions

Conflicts:
libavformat/img2.c

See: 6fe12c7ff2094c68a8b6e9aeea7744ca15594091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
Michael Niedermayer [Thu, 12 Dec 2013 18:36:09 +0000 (19:36 +0100)]
Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
libavformat/rtsp.c

See: 00792322990188b1130ef2befd68ec1d51ab7365
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'
Michael Niedermayer [Thu, 12 Dec 2013 18:11:07 +0000 (19:11 +0100)]
Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'

* commit '6b45f05ef5b241fd1513702119af9c30056a0ac5':
  parseutils: fix discarding const attribute warning

Conflicts:
libavutil/parseutils.c

See: fe87b2e79c734a111747a239943c7340f8d3f7d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/hlsenc: copy metadata
Michael Niedermayer [Thu, 12 Dec 2013 17:41:39 +0000 (18:41 +0100)]
avformat/hlsenc: copy metadata

Fixes Ticket2296

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/oggparseopus: Check opus_duration() return value
James Almer [Thu, 12 Dec 2013 06:34:19 +0000 (03:34 -0300)]
avformat/oggparseopus: Check opus_duration() return value

Regression since 39d11d599cd292485fe991cd22e10d7a1738b3bc

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agompegts: add HEVC registration descriptor
Carl Eugen Hoyos [Wed, 16 Oct 2013 02:12:27 +0000 (04:12 +0200)]
mpegts: add HEVC registration descriptor

10 years agochangelog: drop redundant new attribute
Vittorio Giovara [Thu, 28 Nov 2013 14:01:50 +0000 (15:01 +0100)]
changelog: drop redundant new attribute

10 years agoimg2: add stereo 3d still picture file extensions
Martin Lambers [Wed, 16 Oct 2013 15:37:02 +0000 (17:37 +0200)]
img2: add stereo 3d still picture file extensions

10 years agortsp: suppress a incompatible pointer types warning
Vittorio Giovara [Tue, 10 Dec 2013 22:48:19 +0000 (22:48 +0000)]
rtsp: suppress a incompatible pointer types warning

10 years agoparseutils: fix discarding const attribute warning
Vittorio Giovara [Tue, 3 Dec 2013 11:57:51 +0000 (12:57 +0100)]
parseutils: fix discarding const attribute warning

10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 12 Dec 2013 11:59:43 +0000 (12:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3adu: Set the channel layout properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agomp3adu: Set the channel layout properly
Martin Storsjö [Wed, 11 Dec 2013 16:52:44 +0000 (18:52 +0200)]
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>
10 years agoavformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice...
Michael Niedermayer [Thu, 12 Dec 2013 04:33:21 +0000 (05:33 +0100)]
avformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice by mistake

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/oggdec: reset end_trimming in ogg_reset()
Dale Curtis [Thu, 12 Dec 2013 04:31:43 +0000 (05:31 +0100)]
avformat/oggdec: reset end_trimming in ogg_reset()

Fixes the output when seeking back to the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 11 Dec 2013 23:40:54 +0000 (00:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'
Michael Niedermayer [Wed, 11 Dec 2013 23:32:15 +0000 (00:32 +0100)]
Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'

* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
  lavc: deprecate avcodec_get_frame_defaults().

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '598ce4ab4f1893e0661fc038101487e511937877'
Michael Niedermayer [Wed, 11 Dec 2013 23:25:31 +0000 (00:25 +0100)]
Merge commit '598ce4ab4f1893e0661fc038101487e511937877'

* commit '598ce4ab4f1893e0661fc038101487e511937877':
  h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'
Michael Niedermayer [Wed, 11 Dec 2013 23:19:49 +0000 (00:19 +0100)]
Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'

* commit '48d17ee6dc2b2a552f645484f200c2946bf24607':
  api-example: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'
Michael Niedermayer [Wed, 11 Dec 2013 23:14:18 +0000 (00:14 +0100)]
Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'

* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'
Michael Niedermayer [Wed, 11 Dec 2013 23:07:50 +0000 (00:07 +0100)]
Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'

* commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69':
  mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'
Michael Niedermayer [Wed, 11 Dec 2013 22:55:47 +0000 (23:55 +0100)]
Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'

* commit 'b06c8bce02b15115a4789252365df2dda0c4713c':
  mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'
Michael Niedermayer [Wed, 11 Dec 2013 22:49:44 +0000 (23:49 +0100)]
Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'

* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4':
  avplay: do not call avcodec_get_frame_defaults().

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'
Michael Niedermayer [Wed, 11 Dec 2013 22:40:57 +0000 (23:40 +0100)]
Merge commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521'

* commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521':
  lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '674fa49110a661694188a958be13d529b7c8c5dd'
Michael Niedermayer [Wed, 11 Dec 2013 22:36:10 +0000 (23:36 +0100)]
Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

* commit '674fa49110a661694188a958be13d529b7c8c5dd':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '943135621830ac3857d3cf766cfc280a95bb3c13'
Michael Niedermayer [Wed, 11 Dec 2013 22:24:42 +0000 (23:24 +0100)]
Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'

* commit '943135621830ac3857d3cf766cfc280a95bb3c13':
  lavc: deprecate avcodec_free_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'
Michael Niedermayer [Wed, 11 Dec 2013 22:18:21 +0000 (23:18 +0100)]
Merge commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9'

* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
doc/examples/decoding_encoding.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9'
Michael Niedermayer [Wed, 11 Dec 2013 22:15:25 +0000 (23:15 +0100)]
Merge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9'

* commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9':
  hevc: set time_base when possible

See: f90281ca97d45a87e3671f5e6e64794f2632fef2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '33452aede6acab78f726cd1924824585f00765cc'
Michael Niedermayer [Wed, 11 Dec 2013 22:05:04 +0000 (23:05 +0100)]
Merge commit '33452aede6acab78f726cd1924824585f00765cc'

* commit '33452aede6acab78f726cd1924824585f00765cc':
  hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c

See: 36658c978f5d7df2ce556075946f3a80f7eca753
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3'
Michael Niedermayer [Wed, 11 Dec 2013 22:01:42 +0000 (23:01 +0100)]
Merge commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3'

* commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3':
  hevc: do not dereference pointer before NULL check in verify_md5()

See: f2eca8d06060b9ec265c21ae38b6dd3088c52cc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'
Michael Niedermayer [Wed, 11 Dec 2013 21:51:44 +0000 (22:51 +0100)]
Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'

* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agotools/probetest: Check av_realloc() return code
Michael Niedermayer [Wed, 11 Dec 2013 21:28:56 +0000 (22:28 +0100)]
tools/probetest: Check av_realloc() return code

Fixess CID1135761
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agopostproc: fix null pointer dereference with invalid option strings
Michael Niedermayer [Wed, 11 Dec 2013 21:24:51 +0000 (22:24 +0100)]
postproc: fix null pointer dereference with invalid option strings

Fixes CID1135760
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agortspdec: Fix keep-alive request for ACTi cameras
Rumin Sam [Mon, 9 Dec 2013 20:43:51 +0000 (17:43 -0300)]
rtspdec: Fix keep-alive request for ACTi cameras

Some ACTi cameras fail if "*" is passed as the URI.

Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoavutil/avstring: fix () position
Michael Niedermayer [Wed, 11 Dec 2013 20:09:56 +0000 (21:09 +0100)]
avutil/avstring: fix () position

Fixes CID1135751

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolavc: deprecate avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 11:00:57 +0000 (12:00 +0100)]
lavc: deprecate avcodec_get_frame_defaults().

Also bump libavcodec micro and add an APIchanges entry saying that
av_frame_* should now be used instead of the lavc AVFrame functions.

10 years agoh264: call av_frame_unref() instead of avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:51:31 +0000 (11:51 +0100)]
h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.

10 years agoapi-example: remove an unneeded call to avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:55:57 +0000 (11:55 +0100)]
api-example: remove an unneeded call to avcodec_get_frame_defaults().

avcodec_decode_audio4() resets the frame itself.

10 years agolavf: remove an unneeded call to avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:55:57 +0000 (11:55 +0100)]
lavf: remove an unneeded call to avcodec_get_frame_defaults().

avcodec_decode_*() resets the frame itself.

10 years agompegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:51:31 +0000 (11:51 +0100)]
mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.

10 years agompegvideo: remove an unneeded call to avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:54:46 +0000 (11:54 +0100)]
mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().

ff_mpeg_unref_picture() already resets the frame.

10 years agoavplay: do not call avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:49:23 +0000 (11:49 +0100)]
avplay: do not call avcodec_get_frame_defaults().

avcodec_decode_audio4() will reset the frame itself.

10 years agolavc: call av_frame_unref() instead of avcodec_get_frame_defaults().
Anton Khirnov [Mon, 9 Dec 2013 10:48:25 +0000 (11:48 +0100)]
lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().

avcodec_get_frame_defaults() will be deprecated.

10 years agoavconv: do not call avcodec_get_frame_defaults()
Anton Khirnov [Tue, 3 Dec 2013 11:00:32 +0000 (12:00 +0100)]
avconv: do not call avcodec_get_frame_defaults()

Strictly speaking it is not correct to call it on refcounted frames, in
any case it is unnecessary, since filtered_frame is always unreferenced
after poll_filter() returns.

10 years agolavc: deprecate avcodec_free_frame()
Anton Khirnov [Fri, 29 Nov 2013 20:43:56 +0000 (21:43 +0100)]
lavc: deprecate avcodec_free_frame()

av_frame_free() should be used instead.

10 years agoReplace all uses of avcodec_free_frame with av_frame_free().
Anton Khirnov [Fri, 29 Nov 2013 20:41:52 +0000 (21:41 +0100)]
Replace all uses of avcodec_free_frame with av_frame_free().

10 years agohevc: set time_base when possible
Guillaume Martres [Tue, 10 Dec 2013 14:42:29 +0000 (15:42 +0100)]
hevc: set time_base when possible

Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agohevc: store the VPS list as an AVBufferRef, just like the others *PS
Gildas Cocherel [Tue, 10 Dec 2013 14:42:28 +0000 (15:42 +0100)]
hevc: store the VPS list as an AVBufferRef, just like the others *PS

Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agohevc: do not dereference pointer before NULL check in verify_md5()
Michael Niedermayer [Tue, 10 Dec 2013 14:42:26 +0000 (15:42 +0100)]
hevc: do not dereference pointer before NULL check in verify_md5()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agoavformat/utils: Check avcodec_open2() return code in av_find_stream_info()
Michael Niedermayer [Wed, 11 Dec 2013 19:30:21 +0000 (20:30 +0100)]
avformat/utils: Check avcodec_open2() return code in av_find_stream_info()

Fixes CID1135750

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoconfigure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64
Diego Biurrun [Sun, 8 Dec 2013 23:50:39 +0000 (00:50 +0100)]
configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

This enables a more POSIX-compliant printf implementation, that
allows using length modifiers like 'z'.

10 years agoavformat/hdsenc: fix off by 1 error in array size check
Michael Niedermayer [Wed, 11 Dec 2013 19:17:23 +0000 (20:17 +0100)]
avformat/hdsenc: fix off by 1 error in array size check

Fixes CID1135763, CID1135764

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agotools/: Add gen-rc tool for generating Windows resource files
Timothy Gu [Wed, 11 Dec 2013 01:32:56 +0000 (17:32 -0800)]
tools/: Add gen-rc tool for generating Windows resource files

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/hdsenc: fix unintentional integer overflow in hds_write_packet()
Michael Niedermayer [Wed, 11 Dec 2013 15:33:26 +0000 (16:33 +0100)]
avformat/hdsenc: fix unintentional integer overflow in hds_write_packet()

Fixes CID1135762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/hdsenc: Check rename() return value
Michael Niedermayer [Wed, 11 Dec 2013 15:27:14 +0000 (16:27 +0100)]
avformat/hdsenc: Check rename() return value

Fixes CID1135748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/aviobuf: fix null dereference in avio_close_dyn_buf()
Michael Niedermayer [Wed, 11 Dec 2013 15:16:04 +0000 (16:16 +0100)]
avformat/aviobuf: fix null dereference in avio_close_dyn_buf()

Fixes CID1135769

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavfilter/aeval: Fix use of uninitialized variable
Michael Niedermayer [Wed, 11 Dec 2013 14:31:32 +0000 (15:31 +0100)]
avfilter/aeval: Fix use of uninitialized variable

Fixes CID1135776

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