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

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

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

6 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>
6 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>
6 years agoMerge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'
Michael Niedermayer [Mon, 9 Dec 2013 21:10:36 +0000 (22:10 +0100)]
Merge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'

* commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc':
  mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'
Michael Niedermayer [Mon, 9 Dec 2013 21:04:29 +0000 (22:04 +0100)]
Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'

* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
  libx264: set frame packing information when relevant information is found

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'
Michael Niedermayer [Mon, 9 Dec 2013 20:53:23 +0000 (21:53 +0100)]
Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'

* commit '5b10ef729f610fcbc9c485e7b643ce53268144cb':
  h264: parse frame packing arrangement SEI messages and save relevant stereo3d information

Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7e244c68600f479270e979258e389ed5240885fb'
Michael Niedermayer [Mon, 9 Dec 2013 20:33:51 +0000 (21:33 +0100)]
Merge commit '7e244c68600f479270e979258e389ed5240885fb'

* commit '7e244c68600f479270e979258e389ed5240885fb':
  avframe: add codec-independent stereoscopic metadata

Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
Lenny Wang [Mon, 9 Dec 2013 03:01:00 +0000 (21:01 -0600)]
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
Michael Niedermayer [Mon, 9 Dec 2013 19:52:14 +0000 (20:52 +0100)]
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
libavdevice/Makefile
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 9 Dec 2013 19:45:42 +0000 (20:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix remuxing of IMA_QT in mov.
  Do not detect "00000000..." (and other non-changing values) as adp.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '61b203ffe6c71789acb14f51483d63fe9e516842'
Michael Niedermayer [Mon, 9 Dec 2013 19:38:17 +0000 (20:38 +0100)]
Merge commit '61b203ffe6c71789acb14f51483d63fe9e516842'

* commit '61b203ffe6c71789acb14f51483d63fe9e516842':
  configure: detect Solaris libc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'
Michael Niedermayer [Mon, 9 Dec 2013 19:31:29 +0000 (20:31 +0100)]
Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'

* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
  avcodec: Use av_reallocp where suitable

Conflicts:
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
Michael Niedermayer [Mon, 9 Dec 2013 19:06:39 +0000 (20:06 +0100)]
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
  dv: use AVFrame API properly

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'
Michael Niedermayer [Mon, 9 Dec 2013 18:57:58 +0000 (19:57 +0100)]
Merge commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0'

* commit 'c9ca220ef26e36abd22085e6fa156c0dbc43bbf0':
  ac3dec: make drc_scale exponentially

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '37a749012aaacc801fe860428417a6d7b81c103f'
Michael Niedermayer [Mon, 9 Dec 2013 17:58:41 +0000 (18:58 +0100)]
Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'

* commit '37a749012aaacc801fe860428417a6d7b81c103f':
  lavc: rework handling of refcounted_frames=0

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Split host and target libc detection
Diego Biurrun [Thu, 28 Feb 2013 15:16:10 +0000 (16:16 +0100)]
configure: Split host and target libc detection

6 years agoconfigure: Move toolchain dependency declarations to a more appropriate place
Diego Biurrun [Mon, 9 Dec 2013 14:03:22 +0000 (15:03 +0100)]
configure: Move toolchain dependency declarations to a more appropriate place

6 years agoMerge commit 'df7aba52b51007db50410abe15fe28391abd8757'
Michael Niedermayer [Mon, 9 Dec 2013 17:06:52 +0000 (18:06 +0100)]
Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'
Michael Niedermayer [Mon, 9 Dec 2013 16:59:33 +0000 (17:59 +0100)]
Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
  frame: copy flags in av_frame_copy_props()

Conflicts:
libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'
Michael Niedermayer [Mon, 9 Dec 2013 16:48:24 +0000 (17:48 +0100)]
Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'

* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
  lavc/decode_video(): always unref the frame if there is no output in decode_video

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '85f947aefb3dae81f65f518acdffa8e31c679654'
Michael Niedermayer [Mon, 9 Dec 2013 15:13:37 +0000 (16:13 +0100)]
Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'

* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
  lavc: remove a pointless check in decode_audio4()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'
Michael Niedermayer [Mon, 9 Dec 2013 15:07:17 +0000 (16:07 +0100)]
Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: parse frame packing arrangement SEI messages and save relevant stereo3d information
Vittorio Giovara [Sun, 10 Nov 2013 22:23:57 +0000 (23:23 +0100)]
hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information

6 years agompeg12enc: set frame packing information when relevant metadata is found
Vittorio Giovara [Thu, 1 Aug 2013 14:58:27 +0000 (16:58 +0200)]
mpeg12enc: set frame packing information when relevant metadata is found

6 years agompeg12dec: parse frame packing arrangement user_data and save relevant stereo3d infor...
Vittorio Giovara [Wed, 31 Jul 2013 17:04:50 +0000 (19:04 +0200)]
mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information

6 years agolibx264: set frame packing information when relevant information is found
Vittorio Giovara [Sat, 31 Aug 2013 21:15:10 +0000 (23:15 +0200)]
libx264: set frame packing information when relevant information is found

6 years agoh264: parse frame packing arrangement SEI messages and save relevant stereo3d information
Vittorio Giovara [Wed, 20 Feb 2013 15:34:58 +0000 (16:34 +0100)]
h264: parse frame packing arrangement SEI messages and save relevant stereo3d information

6 years agoavframe: add codec-independent stereoscopic metadata
Vittorio Giovara [Thu, 28 Nov 2013 13:47:13 +0000 (14:47 +0100)]
avframe: add codec-independent stereoscopic metadata

6 years agoMerge commit 'e5419709f50593769037ab77d7102f82d9260784'
Michael Niedermayer [Mon, 9 Dec 2013 12:31:23 +0000 (13:31 +0100)]
Merge commit 'e5419709f50593769037ab77d7102f82d9260784'

* commit 'e5419709f50593769037ab77d7102f82d9260784':
  lavc: remove the extended_data workarounds.

Conflicts:
libavcodec/utils.c

One hunk is not merged as not all codecs are updated yet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix remuxing of IMA_QT in mov.
Carl Eugen Hoyos [Mon, 9 Dec 2013 13:24:46 +0000 (14:24 +0100)]
Fix remuxing of IMA_QT in mov.

Fixes ticket #1603.

6 years agoDo not detect "00000000..." (and other non-changing values) as adp.
Carl Eugen Hoyos [Mon, 9 Dec 2013 12:51:00 +0000 (13:51 +0100)]
Do not detect "00000000..." (and other non-changing values) as adp.

6 years agoMerge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
Michael Niedermayer [Mon, 9 Dec 2013 12:19:50 +0000 (13:19 +0100)]
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'

* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
  pthread_frame: use the AVFrame API properly.

Conflicts:
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert: flvenc: Don't pretend to support muxing "plain" VP6
Carl Eugen Hoyos [Thu, 31 Oct 2013 00:24:07 +0000 (01:24 +0100)]
Revert: flvenc: Don't pretend to support muxing "plain" VP6

Muxing VP6 is used by applications and works with Flashplayer.

Reported-by: David Bertrand
6 years agoMerge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
Michael Niedermayer [Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)]
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
Michael Niedermayer [Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)]
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'

* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
  p*menc: use the AVFrame API properly.

Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
Michael Niedermayer [Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)]
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'

* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
  mjpegdec: use the AVFrame API properly.

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd support for picture_ptr field in MJpegDecodeContext
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63)

Conflicts:

libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
Michael Niedermayer [Mon, 9 Dec 2013 10:44:37 +0000 (11:44 +0100)]
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
configure
libavformat/avisynth.c

See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Prefix libc-related variables with "libc_"
Diego Biurrun [Wed, 4 Dec 2013 17:21:30 +0000 (12:21 -0500)]
configure: Prefix libc-related variables with "libc_"

Simplifies host/target libc detection splitting.

6 years agoconfigure: detect Solaris libc
Sean McGovern [Sun, 8 Dec 2013 22:17:12 +0000 (17:17 -0500)]
configure: detect Solaris libc

Add preprocessor flags for API availability as necessary.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavcodec: Use av_reallocp where suitable
Alexandra Khirnova [Fri, 6 Dec 2013 12:44:17 +0000 (13:44 +0100)]
avcodec: Use av_reallocp where suitable

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodv: use AVFrame API properly
Anton Khirnov [Fri, 29 Nov 2013 07:58:10 +0000 (08:58 +0100)]
dv: use AVFrame API properly

6 years agoac3dec: make drc_scale exponentially
John Stebbins [Wed, 20 Nov 2013 17:26:45 +0000 (09:26 -0800)]
ac3dec: make drc_scale exponentially

The a52 spec suggests that "partial compression" should scale the
drc value in this manner.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavc: rework handling of refcounted_frames=0
Anton Khirnov [Fri, 29 Nov 2013 19:49:18 +0000 (20:49 +0100)]
lavc: rework handling of refcounted_frames=0

Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).

Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().

6 years agoframe: cosmetics, reindent
Anton Khirnov [Fri, 29 Nov 2013 19:41:35 +0000 (20:41 +0100)]
frame: cosmetics, reindent

6 years agoframe: copy flags in av_frame_copy_props()
Anton Khirnov [Fri, 29 Nov 2013 19:40:34 +0000 (20:40 +0100)]
frame: copy flags in av_frame_copy_props()

Flags can be considered metadata (at least those that are defined now).

6 years agolavc/decode_video(): always unref the frame if there is no output in decode_video
Anton Khirnov [Fri, 29 Nov 2013 19:20:20 +0000 (20:20 +0100)]
lavc/decode_video(): always unref the frame if there is no output in decode_video

Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.

6 years agolavc: remove a pointless check in decode_audio4()
Anton Khirnov [Fri, 29 Nov 2013 19:19:27 +0000 (20:19 +0100)]
lavc: remove a pointless check in decode_audio4()

av_frame_unref() works fine on unallocated frames.

6 years agolavc: use buf[0] instead of data[0] as the indicator of an allocated frame
Anton Khirnov [Fri, 29 Nov 2013 19:16:07 +0000 (20:16 +0100)]
lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

data[0] may be NULL for valid frames with hwaccel pixel formats.

6 years agolavc: remove the extended_data workarounds.
Anton Khirnov [Sat, 9 Nov 2013 18:57:14 +0000 (19:57 +0100)]
lavc: remove the extended_data workarounds.

All decoders should now handle it properly.

6 years agopthread_frame: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
pthread_frame: use the AVFrame API properly.

Remove the extended_data workaround, all decoders should now handle this
properly.

6 years agomxpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mxpegdec: use the AVFrame API properly.

6 years agop*menc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
p*menc: use the AVFrame API properly.

6 years agomjpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mjpegdec: use the AVFrame API properly.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 9 Dec 2013 03:46:24 +0000 (04:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move adding of compat objects out of libc detection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
Michael Niedermayer [Mon, 9 Dec 2013 03:12:40 +0000 (04:12 +0100)]
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocommon.mak: Less ugly version of the previous windres fix
James Almer [Mon, 9 Dec 2013 01:44:52 +0000 (22:44 -0300)]
common.mak: Less ugly version of the previous windres fix

Using subst here is a really ugly hack

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Move MinGW64 specific check to the correct place
James Almer [Sun, 8 Dec 2013 19:13:07 +0000 (16:13 -0300)]
configure: Move MinGW64 specific check to the correct place

It was misplaced during merge of commit 120797e2ef0ca317daf63ad79be5f72f835e9ac2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocommon.mak: fix the current fate failures with windres
James Almer [Sun, 8 Dec 2013 18:57:36 +0000 (15:57 -0300)]
common.mak: fix the current fate failures with windres

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1enc: support forcing experimental 1.4 version
Michael Niedermayer [Sun, 8 Dec 2013 23:39:02 +0000 (00:39 +0100)]
avcodec/ffv1enc: support forcing experimental 1.4 version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT
Michael Niedermayer [Sun, 8 Dec 2013 21:09:50 +0000 (22:09 +0100)]
avcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT

about 1% better compression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: AviSynth demuxer rewrite
d s [Wed, 27 Nov 2013 02:58:28 +0000 (21:58 -0500)]
avformat: AviSynth demuxer rewrite

Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.

Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.

The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by

Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoconfigure: Move adding of compat objects out of libc detection
Diego Biurrun [Mon, 2 Dec 2013 04:06:02 +0000 (23:06 -0500)]
configure: Move adding of compat objects out of libc detection