ffmpeg.git
5 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.

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

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

5 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

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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.

5 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.

5 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.

5 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.

5 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.

5 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.

5 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.

5 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.

5 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.

5 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().

5 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>
5 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>
5 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>
5 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>
5 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'.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoavcodec/utils: Print warning if avcodec_set_dimensions() failed
Michael Niedermayer [Wed, 11 Dec 2013 14:28:27 +0000 (15:28 +0100)]
avcodec/utils: Print warning if avcodec_set_dimensions() failed

Fixes CID1135744
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bitstream: remove unused variable
Michael Niedermayer [Wed, 11 Dec 2013 13:34:45 +0000 (14:34 +0100)]
avcodec/bitstream: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoForce one stream for raw muxers.
Carl Eugen Hoyos [Wed, 11 Dec 2013 12:15:49 +0000 (13:15 +0100)]
Force one stream for raw muxers.

Based on eeb975f5
Fixes ticket #3217.

Reviewed-by: Nicolas George
5 years agoavformat/oggparseopus: calculate pts/dts for initial packets after seeking
Michael Niedermayer [Wed, 11 Dec 2013 03:38:40 +0000 (04:38 +0100)]
avformat/oggparseopus: calculate pts/dts for initial packets after seeking

based on code from oggparsevorbis
Fixes Ticket3124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparseopus: factor opus_duration() out
Michael Niedermayer [Wed, 11 Dec 2013 03:15:38 +0000 (04:15 +0100)]
avformat/oggparseopus: factor opus_duration() out

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

* qatar/master:
  alsdec: check block length

See: 0ceca269b66ec12a23bf0907bd2c220513cdbf16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowdec: check av_frame_ref() return value
Michael Niedermayer [Tue, 10 Dec 2013 23:30:43 +0000 (00:30 +0100)]
avcodec/snowdec: check av_frame_ref() return value

Fixes CID1135742

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pthread_frame: Fix memleak of AVCodecContext on error
Michael Niedermayer [Tue, 10 Dec 2013 23:27:09 +0000 (00:27 +0100)]
avcodec/pthread_frame: Fix memleak of AVCodecContext on error

Fixes CID1135767
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/indeo3: check the return code of ff_set_dimensions()
Michael Niedermayer [Tue, 10 Dec 2013 17:34:52 +0000 (18:34 +0100)]
avcodec/indeo3: check the return code of ff_set_dimensions()

This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

Fixes CID1135740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: fix code that blindly dereferences NULL DPB
Michael Niedermayer [Tue, 10 Dec 2013 22:41:50 +0000 (23:41 +0100)]
avcodec/h264: fix code that blindly dereferences NULL DPB

Fixes mixed flushing and decoding NULL packets
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hnm4video: change width/height to int
Michael Niedermayer [Tue, 10 Dec 2013 21:48:41 +0000 (22:48 +0100)]
avcodec/hnm4video: change width/height to int

Fixes hypothetical integer overflows
Related to CID1135770 & CID1135771

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: check the return code of ff_set_dimensions()
Michael Niedermayer [Tue, 10 Dec 2013 17:34:52 +0000 (18:34 +0100)]
avcodec/g2meet: check the return code of ff_set_dimensions()

This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

Fixes CID1135739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodvdsub_parse_extradata: fix memleak
Michael Niedermayer [Tue, 10 Dec 2013 17:30:44 +0000 (18:30 +0100)]
dvdsub_parse_extradata: fix memleak

Fixes CID1135765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: Correctly set time_base
Guillaume Martres [Tue, 10 Dec 2013 14:37:22 +0000 (15:37 +0100)]
hevc: Correctly set time_base

- Try reading the time_base information from the VPS too, not just the VUI
- Only set time_base when an SPS is activated, not when it's decoded.
- Reduce the fraction before setting it.
- Don't set anything if the fraction is invalid (because the VUI is not
  present or because the encoded value is invalid).

Conflicts:
libavcodec/hevc_ps.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: avoid some unnecessary differences with libav
Guillaume Martres [Tue, 10 Dec 2013 14:37:21 +0000 (15:37 +0100)]
hevc: avoid some unnecessary differences with libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosonic: Switch to rangecoder
Michael Niedermayer [Tue, 10 Dec 2013 15:11:13 +0000 (16:11 +0100)]
sonic: Switch to rangecoder

significantly improves compression rate

This also bumps version to 2 and drops support for version 0/1
If someone used version 0/1 despite their experimental status then support
for these can and should be added back

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sonic: add larger version and minor_version fields with version >= 2
Michael Niedermayer [Tue, 10 Dec 2013 14:54:30 +0000 (15:54 +0100)]
avcodec/sonic: add larger version and minor_version fields with version >= 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sonic: move version to the context
Michael Niedermayer [Tue, 10 Dec 2013 14:49:30 +0000 (15:49 +0100)]
avcodec/sonic: move version to the context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sonic: fix memleaks
Michael Niedermayer [Tue, 10 Dec 2013 13:42:17 +0000 (14:42 +0100)]
avcodec/sonic: fix memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosonic: use M_SQRT2
Michael Niedermayer [Wed, 4 May 2011 15:20:49 +0000 (17:20 +0200)]
sonic: use M_SQRT2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalsdec: check block length
Reinhard Tartler [Sun, 8 Dec 2013 18:24:26 +0000 (13:24 -0500)]
alsdec: check block length

Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Addresses: CVE-2013-0845

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

* qatar/master:
  configure: Move log2 dependency declaration to a place it takes effect

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Move log2 dependency declaration to a place it takes effect
Diego Biurrun [Tue, 10 Dec 2013 08:25:18 +0000 (09:25 +0100)]
configure: Move log2 dependency declaration to a place it takes effect

It was incorrectly moved in c869fcdeac3b7cd71a852b928902daadeca55685.

5 years agoavcodec/libvpx: set CODEC_CAP_EXPERIMENTAL correctly instead of testing at codec...
Michael Niedermayer [Sun, 8 Dec 2013 13:04:06 +0000 (14:04 +0100)]
avcodec/libvpx: set CODEC_CAP_EXPERIMENTAL correctly instead of testing at codec open time

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1.4: use 2 coefficients for calculating the Y plane in the RCT
Michael Niedermayer [Tue, 10 Dec 2013 02:14:41 +0000 (03:14 +0100)]
ffv1.4: use 2 coefficients for calculating the Y plane in the RCT

0-0.7% improved compression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1enc: fix use of uninitalized variable in choose_rct_params()
Michael Niedermayer [Tue, 10 Dec 2013 01:53:04 +0000 (02:53 +0100)]
avcodec/ffv1enc: fix use of uninitalized variable in choose_rct_params()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 10 Dec 2013 00:56:49 +0000 (01:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Split host and target libc detection

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c869fcdeac3b7cd71a852b928902daadeca55685'
Michael Niedermayer [Tue, 10 Dec 2013 00:44:49 +0000 (01:44 +0100)]
Merge commit 'c869fcdeac3b7cd71a852b928902daadeca55685'

* commit 'c869fcdeac3b7cd71a852b928902daadeca55685':
  configure: Move toolchain dependency declarations to a more appropriate place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: check that extended data has been set correctly instead of forcing...
Michael Niedermayer [Tue, 10 Dec 2013 00:00:01 +0000 (01:00 +0100)]
avcodec/utils: check that extended data has been set correctly instead of forcing it in avcodec_decode_video2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideodec: free coded_frame with av_frame_free() instead if av_free*
Michael Niedermayer [Mon, 9 Dec 2013 23:52:12 +0000 (00:52 +0100)]
avcodec/libutvideodec: free coded_frame with av_frame_free() instead if av_free*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideodec: use av_frame_move_ref()
Michael Niedermayer [Mon, 9 Dec 2013 23:50:09 +0000 (00:50 +0100)]
avcodec/libutvideodec: use av_frame_move_ref()

AVFrames cannot be copied literally, their definition is in
avutil and their extended_data can point to their data[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: dont depend on the channel layout in unrefcount_frame()
Michael Niedermayer [Mon, 9 Dec 2013 23:33:15 +0000 (00:33 +0100)]
avcodec/utils: dont depend on the channel layout in unrefcount_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Fix adelay example.
Carl Eugen Hoyos [Mon, 9 Dec 2013 22:56:23 +0000 (23:56 +0100)]
doc: Fix adelay example.

Fixes ticket #3211.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 9 Dec 2013 21:25:38 +0000 (22:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'
Michael Niedermayer [Mon, 9 Dec 2013 21:16:27 +0000 (22:16 +0100)]
Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'

* commit '3d1d175367f1f22e0c4952299a258272e2e2acf1':
  mpeg12enc: set frame packing information when relevant metadata is found

Conflicts:
libavcodec/mpeg12enc.c

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