OSDN Git Service
Andrew Kelley [Tue, 25 Feb 2014 09:37:26 +0000 (04:37 -0500)]
avfilter/af_compand: fix invalid read
Fixes #3383.
Michael Niedermayer [Tue, 25 Feb 2014 18:12:30 +0000 (19:12 +0100)]
Merge commit '
a1c699659d56b76c0bf399307f642c6fd6d28281'
* commit '
a1c699659d56b76c0bf399307f642c6fd6d28281':
parser: K&R formatting cosmetics
Conflicts:
libavcodec/parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 25 Feb 2014 18:03:29 +0000 (19:03 +0100)]
Merge commit '
ed61f3ca8a0664a697782253b354055136c5d303'
* commit '
ed61f3ca8a0664a697782253b354055136c5d303':
parser: Remove commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 25 Feb 2014 10:47:28 +0000 (11:47 +0100)]
mpegvideo: re-indent buffer clearing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 25 Feb 2014 10:47:27 +0000 (11:47 +0100)]
mpegvideo: fix overwriting hwaccel surface objects
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Tue, 25 Feb 2014 10:02:56 +0000 (21:02 +1100)]
avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 23 Feb 2014 22:59:25 +0000 (23:59 +0100)]
parser: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Tue, 25 Feb 2014 10:59:05 +0000 (11:59 +0100)]
parser: Remove commented-out cruft
Michael Niedermayer [Tue, 25 Feb 2014 08:02:57 +0000 (09:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
texi2pod: always declare the pod file as UTF-8 encoded
Conflicts:
doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 23 Feb 2014 22:19:23 +0000 (23:19 +0100)]
lavu/buffer: add release function
new function allows to unref buffer and obtain its data.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Mon, 24 Feb 2014 02:19:55 +0000 (02:19 +0000)]
ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check
avio_open2() only return < 0 when error.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 24 Feb 2014 19:22:13 +0000 (20:22 +0100)]
texi2pod: always declare the pod file as UTF-8 encoded
Michael Niedermayer [Mon, 24 Feb 2014 21:29:06 +0000 (22:29 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 21:19:41 +0000 (22:19 +0100)]
Merge commit '
48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
* commit '
48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 21:13:42 +0000 (22:13 +0100)]
Merge commit '
39c2880eeae6930b1036ce1f479afc1e1152c13f'
* commit '
39c2880eeae6930b1036ce1f479afc1e1152c13f':
af_volume: preserve frame properties
Conflicts:
libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:44:52 +0000 (21:44 +0100)]
Merge commit '
dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
* commit '
dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)]
Merge commit '
67f2a688143b644f99360565a9f36c61a5f052e9'
* commit '
67f2a688143b644f99360565a9f36c61a5f052e9':
avconv: remove a write-only variable
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:05:09 +0000 (21:05 +0100)]
Merge commit '
8aca00cc2b25810bdd85b75f5632844a5614b707'
* commit '
8aca00cc2b25810bdd85b75f5632844a5614b707':
libx265: Properly handled dynamic linking with MSVC
See:
87769d6c8f6d71e4814821f7e6f57b4b65eaf2a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 20:03:25 +0000 (21:03 +0100)]
Michael Niedermayer [Mon, 24 Feb 2014 20:02:06 +0000 (21:02 +0100)]
Michael Niedermayer [Mon, 24 Feb 2014 19:40:52 +0000 (20:40 +0100)]
Merge commit '
d00a504b244e136a0c82a55e21ed94659e0674ad'
* commit '
d00a504b244e136a0c82a55e21ed94659e0674ad':
libx265: Update API usage
Conflicts:
libavcodec/libx265.c
See:
d3736471948cd06851f6b3aef352ef285b7c6480
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 21:44:37 +0000 (22:44 +0100)]
avformat/options_table: add named constants for avoid_negative_ts
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 24 Feb 2014 16:03:03 +0000 (17:03 +0100)]
doc: fix one accented word
Vittorio Giovara [Mon, 24 Feb 2014 15:59:40 +0000 (16:59 +0100)]
doc: name correct header
Anton Khirnov [Wed, 19 Feb 2014 19:55:27 +0000 (20:55 +0100)]
af_volume: preserve frame properties
Anton Khirnov [Wed, 19 Feb 2014 19:42:39 +0000 (20:42 +0100)]
af_resample: preserve frame properties
Anton Khirnov [Wed, 19 Feb 2014 15:16:43 +0000 (16:16 +0100)]
avconv: remove a write-only variable
Derek Buitenhuis [Fri, 21 Feb 2014 17:13:56 +0000 (12:13 -0500)]
libx265: Use proper error code
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:11:00 +0000 (12:11 -0500)]
libx265: Properly handled dynamic linking with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:05:50 +0000 (12:05 -0500)]
libx265: Support SAR
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:59:13 +0000 (11:59 -0500)]
libx265: Support 4:4:4
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:26:40 +0000 (11:26 -0500)]
libx265: Update API usage
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:11:00 +0000 (12:11 -0500)]
libx265: Properly handled dynamic linking with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 17:05:50 +0000 (12:05 -0500)]
libx265: Support SAR
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:59:13 +0000 (11:59 -0500)]
libx265: Support 4:4:4
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 21 Feb 2014 16:26:40 +0000 (11:26 -0500)]
libx265: Update API usage
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 24 Feb 2014 09:47:47 +0000 (10:47 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use av_frame_copy() to simplify code where appropriate.
Conflicts:
libavfilter/vf_copy.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 09:15:16 +0000 (10:15 +0100)]
Merge commit '
8feac29cc46270cc89d6016340e7bac780877131'
* commit '
8feac29cc46270cc89d6016340e7bac780877131':
lavc: use AVFrame API properly in ff_reget_buffer()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 08:52:13 +0000 (09:52 +0100)]
avutil/frame_copy_audio: also check that channels match
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 08:37:14 +0000 (09:37 +0100)]
Merge commit '
1155fd02ae7bac215acab316e847c6bb25f74fc3'
* commit '
1155fd02ae7bac215acab316e847c6bb25f74fc3':
frame: add a convenience function for copying AVFrame data
Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 24 Feb 2014 07:53:13 +0000 (08:53 +0100)]
Merge commit '
746dca483a2f0f2639265f6e1c0085c8861875a1'
* commit '
746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See:
6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 24 Feb 2014 05:34:38 +0000 (02:34 -0300)]
x86: Move XOP emulation to x86util
We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 21:29:51 +0000 (22:29 +0100)]
swr: check that the context for swr_convert() has been initialized
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 21:28:24 +0000 (22:28 +0100)]
swresample: add swr_is_initialized()
Idea-from/based-on:
7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 11 Feb 2014 14:08:12 +0000 (15:08 +0100)]
Use av_frame_copy() to simplify code where appropriate.
Anton Khirnov [Tue, 11 Feb 2014 13:59:00 +0000 (14:59 +0100)]
lavc: use AVFrame API properly in ff_reget_buffer()
Anton Khirnov [Tue, 11 Feb 2014 13:15:20 +0000 (14:15 +0100)]
frame: add a convenience function for copying AVFrame data
Anton Khirnov [Sun, 23 Feb 2014 07:05:52 +0000 (08:05 +0100)]
avconv: support forcing codec tags for input streams
James Almer [Thu, 9 Jan 2014 22:17:50 +0000 (19:17 -0300)]
oggdec: validate VP8 keyframes
Fixes seeking with broken files
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:52:42 +0000 (22:52 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: add detection for Bit Manipulation Instruction sets
Conflicts:
libavutil/x86/cpu.c
See:
0bc3de19ffe296254f214dc7615e624d8e401bcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:42:43 +0000 (22:42 +0100)]
Merge commit '
1b932eb1508f550fac9e911923a0383efda53aa3'
* commit '
1b932eb1508f550fac9e911923a0383efda53aa3':
x86: add detection for FMA3 instruction set
Conflicts:
configure
libavutil/cpu.h
libavutil/x86/cpu.c
See:
a2af8eddab75f1eac712411e4dde89823c0845e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:32:51 +0000 (22:32 +0100)]
Merge commit '
10b0161d78148f46eaffb29ea022378947eaef2c'
* commit '
10b0161d78148f46eaffb29ea022378947eaef2c':
x86: add missing XOP checks and macros
Conflicts:
configure
libavutil/x86/cpu.h
See:
6c12b1de064d2604d19cb4c238a788cfed9679ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:25:08 +0000 (22:25 +0100)]
Merge commit '
5800ba0db667630e6ff81d30f03961ea10726aa6'
* commit '
5800ba0db667630e6ff81d30f03961ea10726aa6':
configure: disable cpunop if the check fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 2 Nov 2013 16:21:52 +0000 (17:21 +0100)]
configure: Move cpunop into ARCH_EXT_LIST_X86
It is a processor feature, so it belongs there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:17:19 +0000 (22:17 +0100)]
Merge commit '
8eeacf31c5ea37baf6b222dc38d20cf4fd33c455'
* commit '
8eeacf31c5ea37baf6b222dc38d20cf4fd33c455':
hevc: Do not left shift a negative value in hevc_loop_filter_chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:10:58 +0000 (22:10 +0100)]
Merge commit '
ff486c0f7f6b2ace3f0238660bc06cc35b389676'
* commit '
ff486c0f7f6b2ace3f0238660bc06cc35b389676':
hevc: Do not right shift a negative value in get_pcm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 21:02:45 +0000 (22:02 +0100)]
Merge commit '
50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'
* commit '
50c988aa6d6c6f0ceb8f922bcea34800b56b85d9':
hevc: Drop unnecessary shifts in deblocking_filter_CTB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 23 Feb 2014 19:11:30 +0000 (20:11 +0100)]
avcodec/pngenc: fix invalid read in sub filter.
First pixel was computed based on invalid address read, and then
corrected by the following memcpy. After the commit, it's not computed
anymore, and memcpy fills the appropriate area.
Fixes Ticket #3387
Michael Niedermayer [Sun, 23 Feb 2014 17:20:05 +0000 (18:20 +0100)]
avcodec/h264: clear chroma planes when flags gray is used
Fixes Ticket3397
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Feb 2014 17:14:59 +0000 (18:14 +0100)]
avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 22 Feb 2014 04:54:02 +0000 (04:54 +0000)]
x86: add detection for Bit Manipulation Instruction sets
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 22 Feb 2014 04:54:01 +0000 (04:54 +0000)]
x86: add detection for FMA3 instruction set
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 22 Feb 2014 04:54:00 +0000 (04:54 +0000)]
x86: add missing XOP checks and macros
Signed-off-by: James Almer <jamrial@gmail.com>
Janne Grunau [Sun, 23 Feb 2014 13:09:06 +0000 (14:09 +0100)]
configure: disable cpunop if the check fails
Moving cpunop from the HAVE_LIST to the ARCH_EXT_LIST_X86 has the side
effect of enabling it. The semantics of the check have to be changed
from enable if successful to disable if unsuccessful. This was missing
in
2b0bb69997c2416e74f41aa1400ce983bf8775c0 causing build errors with
nasm.
Luca Barbato [Wed, 19 Feb 2014 20:56:35 +0000 (21:56 +0100)]
hevc: Do not left shift a negative value in hevc_loop_filter_chroma
Luca Barbato [Wed, 19 Feb 2014 21:21:43 +0000 (22:21 +0100)]
hevc: Do not right shift a negative value in get_pcm
Luca Barbato [Wed, 19 Feb 2014 19:38:53 +0000 (20:38 +0100)]
hevc: Drop unnecessary shifts in deblocking_filter_CTB
beta_offset is pre-multiplied by 2.
Carl Eugen Hoyos [Sun, 23 Feb 2014 09:47:18 +0000 (10:47 +0100)]
Add more Bayer colour spaces to the video4linux2 device wrapper.
Peter Ross [Sat, 22 Feb 2014 12:42:15 +0000 (23:42 +1100)]
avdevice/v4l2: add V4L2_PIX_FMT_SRGGB8
Sylvain Fabre [Sun, 23 Feb 2014 09:30:37 +0000 (10:30 +0100)]
Issue-#3407 : Enhance precision for double to string conversion, useful for GEOTIFF double values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 23 Feb 2014 01:18:57 +0000 (12:18 +1100)]
libswscale: bayer to rgb24 & yv12 colorspace converters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 23 Feb 2014 01:18:42 +0000 (12:18 +1100)]
avcodec/rawdec: for 16-bit pix fmts, shift pixels when bits_per_coded_sample < 16
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 23 Feb 2014 01:18:33 +0000 (12:18 +1100)]
avutil/pixdesc: set bayer pixfmt descriptor flags
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dave Yeo [Sun, 23 Feb 2014 00:04:43 +0000 (16:04 -0800)]
configure: Revert commit
5176e9651bda5182df008a1226e2484fdd809985
This fixes cpunop detection and unbreaks NASM assembly
Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 22 Feb 2014 23:41:53 +0000 (00:41 +0100)]
Support old qclp-in-mov files that do not store bytes_per_frame in the header.
Fixes ticket #2649.
Carl Eugen Hoyos [Sat, 22 Feb 2014 23:31:50 +0000 (00:31 +0100)]
Support MPEG-2 video mov files with sample description mp2v.
Michael Niedermayer [Fri, 21 Feb 2014 01:48:39 +0000 (02:48 +0100)]
avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used
Fix handling of timestamps which start far away from 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Feb 2014 01:43:04 +0000 (02:43 +0100)]
avformat/mux: support shifting timestamps so they start at 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 20:36:30 +0000 (21:36 +0100)]
swresample: factorize clear_context() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 20:11:59 +0000 (21:11 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: return an error if a avresample_open() is called on an open context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 20:05:58 +0000 (21:05 +0100)]
Merge commit '
7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'
* commit '
7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
lavr: add a function for checking whether AVAudioResampleContext is open
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 25 Apr 2013 18:12:47 +0000 (20:12 +0200)]
lavr: return an error if a avresample_open() is called on an open context
Anton Khirnov [Thu, 25 Apr 2013 18:08:49 +0000 (20:08 +0200)]
lavr: add a function for checking whether AVAudioResampleContext is open
Peter Ross [Sat, 22 Feb 2014 12:41:59 +0000 (23:41 +1100)]
avformat/nut: add bayer colorspaces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 22 Feb 2014 12:41:41 +0000 (23:41 +1100)]
avcodec/raw: add bayer formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 22 Feb 2014 05:47:02 +0000 (02:47 -0300)]
x86: add detection for Bit Manipulation Instruction sets
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 22 Feb 2014 05:47:01 +0000 (02:47 -0300)]
x86: add detection for FMA3 instruction set
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 14:41:10 +0000 (15:41 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Fix a typo from the previous commit
See:
76dd01ecd4ed51e0669773470ee0d8db2c2e4d3f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 12:04:18 +0000 (13:04 +0100)]
avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too large but the correct one is constant
Fixes issue1.m2ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 13:22:31 +0000 (14:22 +0100)]
avformat/utils: reset pts_buffer in estimate_timings_from_pts()
This fixes the first few dts after find_stream_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 22 Feb 2014 11:21:28 +0000 (12:21 +0100)]
avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 16 Jan 2014 14:25:38 +0000 (14:25 +0000)]
SDR2 demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Sat, 22 Feb 2014 10:19:03 +0000 (11:19 +0100)]
h264: Fix a typo from the previous commit
f777504f640260337974848c7d5d7a3f064bbb45 changed a - in +
CC: libav-stable@libav.org
Carl Eugen Hoyos [Sat, 22 Feb 2014 10:17:56 +0000 (11:17 +0100)]
Fix FSF address in colormatrix and libzvbi license headers.
As reported by irc user aca.
The files in compat/avisynth are maintained elsewhere, no changes.
Michael Niedermayer [Sat, 22 Feb 2014 01:55:55 +0000 (02:55 +0100)]
avcodec/h264_ps: fix printed num_reorder_frames value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Feb 2014 22:51:33 +0000 (23:51 +0100)]
avcodec/h264: use subsample factors of the used pixel format
Fixes out of array read
Fixes:
1cb91c36c4e55463f14aacb9bdf55b38-asan_heap-oob_106cbce_5617_cov_11212800_h264_mmx_chroma_intra_lf.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Feb 2014 20:14:37 +0000 (21:14 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxf: Add DNxHD UL
See:
2ff540a0fe02c2d2588a7d2aa7820e66a615de95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 21 Feb 2014 19:49:54 +0000 (20:49 +0100)]
Merge commit '
a9099e04026f300924ac363fa6f8aef912677d90'
* commit '
a9099e04026f300924ac363fa6f8aef912677d90':
mxf: Add uncompressed 422 8-bit rawvideo UL
Conflicts:
libavformat/mxf.c
See:
51d632cc8f4c8fa1556d7d8c18c5488700eb6154
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reynaldo H. Verdejo Pinochet [Fri, 14 Feb 2014 20:42:23 +0000 (17:42 -0300)]
qcelp: grammar
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Fri, 14 Feb 2014 20:31:50 +0000 (17:31 -0300)]
qcelpdec: break some too-long lines
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>