ffmpeg.git
5 years agoMerge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'
Michael Niedermayer [Thu, 26 Jun 2014 22:16:34 +0000 (00:16 +0200)]
Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'

* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11':
  output example: store the scaling context in the stream context

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'
Michael Niedermayer [Thu, 26 Jun 2014 21:58:00 +0000 (23:58 +0200)]
Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'

* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
  output example: use a macro instead of a static variable

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'
Michael Niedermayer [Thu, 26 Jun 2014 21:20:54 +0000 (23:20 +0200)]
Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'

* commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb':
  output example: allocate the audio frame only once

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'
Michael Niedermayer [Thu, 26 Jun 2014 21:00:36 +0000 (23:00 +0200)]
Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'

* commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb':
  output example: use OutputStream for audio streams as well

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'
Michael Niedermayer [Thu, 26 Jun 2014 20:44:35 +0000 (22:44 +0200)]
Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'

* commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38':
  output example: use the new AVFrame API to allocate audio frames

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'
Michael Niedermayer [Thu, 26 Jun 2014 20:13:46 +0000 (22:13 +0200)]
Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'

* commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594':
  output example: set output channel layout

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'
Michael Niedermayer [Thu, 26 Jun 2014 19:55:11 +0000 (21:55 +0200)]
Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'

* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3':
  output example: use a struct to bundle the video stream variables together

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '38d044429dabcd28928693240e955c6d4430cca9'
Michael Niedermayer [Thu, 26 Jun 2014 19:28:54 +0000 (21:28 +0200)]
Merge commit '38d044429dabcd28928693240e955c6d4430cca9'

* commit '38d044429dabcd28928693240e955c6d4430cca9':
  output example: use the new AVFrame API for allocating the video frame

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3f4edf012593c73941caa0ef9b292da00225c3df'
Michael Niedermayer [Thu, 26 Jun 2014 19:01:18 +0000 (21:01 +0200)]
Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'

* commit '3f4edf012593c73941caa0ef9b292da00225c3df':
  dump_stream: print the timebase as is, do not reduce it

See: 75511c293add07db1cca58dcd8b08c33fc2f1075
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'
Michael Niedermayer [Thu, 26 Jun 2014 18:56:23 +0000 (20:56 +0200)]
Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'

* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
  lavc: do not allocate edges in the default get_buffer2()

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow: ensure the buffers have allocated edges
Michael Niedermayer [Thu, 26 Jun 2014 18:44:21 +0000 (20:44 +0200)]
avcodec/snow: ensure the buffers have allocated edges

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'
Michael Niedermayer [Thu, 26 Jun 2014 18:10:01 +0000 (20:10 +0200)]
Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'

* commit 'a0e1c3517a656dd32293f054a339e0ac73328138':
  hevc: remove unused array min_cb_addr_zs

Conflicts:
libavcodec/hevc_ps.c

See: f7f1f4c7ce9ce689823e13a53b694eb14cbbf6e7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9b60d9197970658e91daf4b586397f450de9af69'
Michael Niedermayer [Thu, 26 Jun 2014 17:56:42 +0000 (19:56 +0200)]
Merge commit '9b60d9197970658e91daf4b586397f450de9af69'

* commit '9b60d9197970658e91daf4b586397f450de9af69':
  hevc: Allow out of bound values for num_reorder_pics

Conflicts:
libavcodec/hevc_ps.c

See: bc21260e643c2249e38f7485bceada1d4bbb2b9a
See: ab296c7a9fe590860dc95ba97e9cbb9dde798f20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/videodsp: add emulated_edge_mc_mmxext
James Almer [Mon, 23 Jun 2014 18:51:53 +0000 (15:51 -0300)]
x86/videodsp: add emulated_edge_mc_mmxext

This also changes hfix8_mmx and above to use mmx regs instead of
gprs, and makes emulated_edge_mc_sse and emulated_edge_mc_sse2 use
mmxext hfix and hvar functions instead of mmx where possible.

This is mostly in preparation for an ssse3 version.

Signed-off-by: James Almer <jamrial@gmail.com>
code is about 1 cpu cycle faster approximately

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agooutput example: store the scaling context in the stream context
Anton Khirnov [Tue, 24 Jun 2014 08:21:07 +0000 (10:21 +0200)]
output example: store the scaling context in the stream context

5 years agooutput example: use a macro instead of a static variable
Anton Khirnov [Tue, 24 Jun 2014 07:28:41 +0000 (09:28 +0200)]
output example: use a macro instead of a static variable

5 years agooutput example: allocate the audio frame only once
Anton Khirnov [Tue, 24 Jun 2014 07:02:25 +0000 (09:02 +0200)]
output example: allocate the audio frame only once

5 years agooutput example: use OutputStream for audio streams as well
Anton Khirnov [Tue, 24 Jun 2014 06:56:27 +0000 (08:56 +0200)]
output example: use OutputStream for audio streams as well

5 years agooutput example: use the new AVFrame API to allocate audio frames
Anton Khirnov [Tue, 24 Jun 2014 05:51:18 +0000 (07:51 +0200)]
output example: use the new AVFrame API to allocate audio frames

5 years agooutput example: set output channel layout
Anton Khirnov [Mon, 23 Jun 2014 19:38:37 +0000 (21:38 +0200)]
output example: set output channel layout

5 years agooutput example: use a struct to bundle the video stream variables together
Anton Khirnov [Sat, 21 Jun 2014 15:17:40 +0000 (17:17 +0200)]
output example: use a struct to bundle the video stream variables together

5 years agooutput example: use the new AVFrame API for allocating the video frame
Anton Khirnov [Mon, 16 Jun 2014 11:20:51 +0000 (13:20 +0200)]
output example: use the new AVFrame API for allocating the video frame

5 years agodump_stream: print the timebase as is, do not reduce it
Anton Khirnov [Tue, 24 Jun 2014 05:39:35 +0000 (07:39 +0200)]
dump_stream: print the timebase as is, do not reduce it

It makes more sense to print the timebase exactly as it is set. Also,
this avoids a divide by zero when av_dump_format() is called on a format
context before writing the header.

5 years agolavc: do not allocate edges in the default get_buffer2()
Anton Khirnov [Fri, 20 Dec 2013 15:00:07 +0000 (16:00 +0100)]
lavc: do not allocate edges in the default get_buffer2()

5 years agohevc: remove unused array min_cb_addr_zs
Gildas Cocherel [Wed, 25 Jun 2014 19:08:12 +0000 (21:08 +0200)]
hevc: remove unused array min_cb_addr_zs

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/cavs: fix B_SUB_DIRECT col-MB is Intra MB case.
Yao Wang [Thu, 19 Jan 2012 12:39:47 +0000 (20:39 +0800)]
avcodec/cavs: fix B_SUB_DIRECT col-MB is Intra MB case.

in this case current MB size is forced to 16x16 (AVS standard section 9.9.1)

Signed-off-by: Yao Wang <jiayaowang@gmail.com>
Fixes Ticket 1901

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: Allow out of bound values for num_reorder_pics
Kieran Kunhya [Sun, 15 Jun 2014 21:44:15 +0000 (23:44 +0200)]
hevc: Allow out of bound values for num_reorder_pics

This fixes decoding for a sample that cannot be shared

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge commit '593d2326ef985cdffe413df629419938f7b07c4c'
Michael Niedermayer [Thu, 26 Jun 2014 01:15:55 +0000 (03:15 +0200)]
Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'

* commit '593d2326ef985cdffe413df629419938f7b07c4c':
  dv: Replace a magic number by sizeof()

Conflicts:
libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5ab03e41e553452118113d0c224fa32b325e45e5'
Michael Niedermayer [Thu, 26 Jun 2014 00:58:31 +0000 (02:58 +0200)]
Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'

* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
  x86: h264dsp: Fix link failure with optimizations disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfenc: set/force channelcount in MXF D-10
Gaullier Nicolas [Wed, 25 Jun 2014 10:29:30 +0000 (10:29 +0000)]
avformat/mxfenc: set/force channelcount in MXF D-10

There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor.

On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited.
The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space.
At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail".

On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used",
usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing
and only expose this limited number of audio streams
(which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow).

At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants.
(there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties)

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodv: Replace a magic number by sizeof()
Diego Biurrun [Fri, 7 Feb 2014 09:42:35 +0000 (10:42 +0100)]
dv: Replace a magic number by sizeof()

5 years agox86: h264dsp: Fix link failure with optimizations disabled
Diego Biurrun [Wed, 25 Jun 2014 11:35:30 +0000 (04:35 -0700)]
x86: h264dsp: Fix link failure with optimizations disabled

With optimzations disabled compilers have trouble doing dead code
elimination on 'if (foo && 0)' expressions, while 'if (0 && foo)'
still works, so use the latter to avoid problems.

Bug-Id: 707

5 years agoavfilter/x86/vf_pullup: fix old typo
Michael Niedermayer [Wed, 25 Jun 2014 16:10:12 +0000 (18:10 +0200)]
avfilter/x86/vf_pullup: fix old typo

This makes C and MMX match, no change to fate as the differences where
apparently not sufficient to show up in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions
Michael Niedermayer [Wed, 25 Jun 2014 15:49:03 +0000 (17:49 +0200)]
avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions

This should avoid issues on x86_64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc_idct: fix function name in comment
Michael Niedermayer [Wed, 25 Jun 2014 13:08:30 +0000 (15:08 +0200)]
avcodec/x86/hevc_idct: fix function name in comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc_idct: fix number of sse registers
plepere [Mon, 16 Jun 2014 12:47:21 +0000 (14:47 +0200)]
avcodec/x86/hevc_idct: fix number of sse registers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc: add avx2 dc idct
plepere [Mon, 16 Jun 2014 12:47:21 +0000 (14:47 +0200)]
avcodec/x86/hevc: add avx2 dc idct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/build_system: document examples and config targets
Lukasz Marek [Tue, 24 Jun 2014 22:40:09 +0000 (00:40 +0200)]
doc/build_system: document examples and config targets

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 24 Jun 2014 20:25:50 +0000 (22:25 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: decrease audio_diff_threshold
  ffplay: decrease max audio callbacks per second
  ffplay: calculate SDL audio buffer size based on sample rate
  ffplay: pass simple integers to calculate_display_rect and set_default_window_size
  ffplay: eliminate pictq_prev_picture

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2deb614272e6faad8802c5341971d08c7272f74d'
Michael Niedermayer [Tue, 24 Jun 2014 20:03:21 +0000 (22:03 +0200)]
Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'

* commit '2deb614272e6faad8802c5341971d08c7272f74d':
  mjpegdec: Properly set the context colorspace info

See: c11043aca7365add6c4c80b7cff80d22dde0eb94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: decrease audio_diff_threshold
Marton Balint [Sun, 22 Jun 2014 15:06:55 +0000 (17:06 +0200)]
ffplay: decrease audio_diff_threshold

Since audio clock calculations are more accurate now, it is safe to decrease
the sync treshold to compensate the larger buffers caused by less frequent
audio callbacks.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: decrease max audio callbacks per second
Marton Balint [Sat, 14 Jun 2014 15:23:40 +0000 (17:23 +0200)]
ffplay: decrease max audio callbacks per second

Too many audio callbacks per second can cause buffer underruns especially under
load. As now we take into accound the elapsed time after an audio callback when
determining current audio clock, it is not that important to use small buffer
sizes and frequent audio callbacks, so lets remove the comment.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: calculate SDL audio buffer size based on sample rate
Marton Balint [Sun, 25 May 2014 00:41:09 +0000 (02:41 +0200)]
ffplay: calculate SDL audio buffer size based on sample rate

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: pass simple integers to calculate_display_rect and set_default_window_size
Marton Balint [Sat, 24 May 2014 15:11:26 +0000 (17:11 +0200)]
ffplay: pass simple integers to calculate_display_rect and set_default_window_size

No change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: eliminate pictq_prev_picture
Marton Balint [Wed, 27 Nov 2013 23:13:38 +0000 (00:13 +0100)]
ffplay: eliminate pictq_prev_picture

Instead of directly rolling back the frame queue, keep the last displayed
picture in the queue and use a boolean variable to keep track if it is
displayed or not. This makes the code cleaner because it removes the
complicated logic in pictq_prev_picture.

There should be no change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavfilter/vf_deshake: fix macro ()
Michael Niedermayer [Tue, 24 Jun 2014 19:43:22 +0000 (21:43 +0200)]
avfilter/vf_deshake: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_colormatrix: fix macro ()
Michael Niedermayer [Tue, 24 Jun 2014 19:40:57 +0000 (21:40 +0200)]
avfilter/vf_colormatrix: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomjpegdec: Properly set the context colorspace info
Derek Buitenhuis [Tue, 24 Jun 2014 16:38:54 +0000 (17:38 +0100)]
mjpegdec: Properly set the context colorspace info

The JPEG spec requires it to be this.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agomjpegdec: Properly set the context colorspace info
Derek Buitenhuis [Tue, 24 Jun 2014 16:38:54 +0000 (17:38 +0100)]
mjpegdec: Properly set the context colorspace info

The JPEG spec requires it to be this.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavformat/nutdec: improve probe speed by 30%
Michael Niedermayer [Tue, 24 Jun 2014 16:32:14 +0000 (18:32 +0200)]
avformat/nutdec: improve probe speed by 30%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavenc: simplify malloc failure checking
Michael Niedermayer [Tue, 24 Jun 2014 11:51:40 +0000 (13:51 +0200)]
avformat/wavenc: simplify malloc failure checking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavenc: more specific error return for "Writing 16 bit peak for 8 bit audio"
Michael Niedermayer [Tue, 24 Jun 2014 11:50:38 +0000 (13:50 +0200)]
avformat/wavenc: more specific error return for "Writing 16 bit peak for 8 bit audio"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavenc: do not hardcode array size in memset and other functions
Michael Niedermayer [Tue, 24 Jun 2014 11:37:31 +0000 (13:37 +0200)]
avformat/wavenc: do not hardcode array size in memset and other functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wavenc: use the bitexact flag from avformat instead of the one from avcodec
Michael Niedermayer [Tue, 24 Jun 2014 11:32:27 +0000 (13:32 +0200)]
avformat/wavenc: use the bitexact flag from avformat instead of the one from avcodec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc/pps: optimized size of min_tb_addr_zs
gcocherel [Tue, 24 Jun 2014 06:27:16 +0000 (08:27 +0200)]
hevc/pps: optimized size of min_tb_addr_zs
reduce computation too
(cherry picked from commit 39c4d45c7788081c45c7fae51b7c5d0bcbaece9d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: remove min_cb_addr_zs
gcocherel [Thu, 19 Jun 2014 09:21:38 +0000 (11:21 +0200)]
avcodec/hevc_ps: remove min_cb_addr_zs

(cherry picked from commit ff7926d5092f9d4158108963e977e8c992322ba4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoPeak Envelope Chunk encoder: Indent
Georg Lippitsch [Sat, 21 Jun 2014 17:20:40 +0000 (19:20 +0200)]
Peak Envelope Chunk encoder: Indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoEBU Tech 3285 - Supplement 3 - Peak Envelope Chunk encoder
Georg Lippitsch [Sat, 21 Jun 2014 17:20:39 +0000 (19:20 +0200)]
EBU Tech 3285 - Supplement 3 - Peak Envelope Chunk encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_hqx: optimize table init
Michael Niedermayer [Tue, 24 Jun 2014 01:09:08 +0000 (03:09 +0200)]
avfilter/vf_hqx: optimize table init

5389024880 -> 1389386610 dezicycles

This surely can be optimized more, i just didnt want to cause a slowdown
when trying to make the fate test bitexact.
Further optimization left to ubitux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_hqx: avoid floats
Michael Niedermayer [Tue, 24 Jun 2014 00:32:37 +0000 (02:32 +0200)]
avfilter/vf_hqx: avoid floats

this likely fixes fate failures

2748170880 -> 5389024880 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/h264_qpel_10bit: locally define pb_0
Michael Niedermayer [Tue, 24 Jun 2014 00:10:30 +0000 (02:10 +0200)]
avcodec/x86/h264_qpel_10bit: locally define pb_0

somehow old llvm-gcc manages to ignore the alignment from ff_pb_0 causing a crash on freebsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: do not leave ret random on minor failures, causing major failure
Michael Niedermayer [Mon, 23 Jun 2014 23:54:39 +0000 (01:54 +0200)]
avcodec/h264: do not leave ret random on minor failures, causing major failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '772d150a6e82542c06b0c251e73dd299d98d1027'
Michael Niedermayer [Mon, 23 Jun 2014 23:45:59 +0000 (01:45 +0200)]
Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027'

* commit '772d150a6e82542c06b0c251e73dd299d98d1027':
  h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'
Michael Niedermayer [Mon, 23 Jun 2014 23:21:23 +0000 (01:21 +0200)]
Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'

* commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
libavcodec/jpeg2000.c

See: 09927f3eaa93e31dd90ab8ee66dc1ad867b3365f
See: 912ce9dd2080c5837285a471d750fa311e09b555
See: 9e477a37703318cb86d8ed1d426929235aa02b67
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'
Michael Niedermayer [Mon, 23 Jun 2014 23:09:38 +0000 (01:09 +0200)]
Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'

* commit 'ab72eda15e98197cf148abc08574206cfde0d9b0':
  pixfmt: mark the reserved values

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: error out from decode_nal_units() when AV_EF_EXPLODE is set
Vittorio Giovara [Fri, 7 Feb 2014 14:13:40 +0000 (15:13 +0100)]
h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agojpeg2000: fix dereferencing invalid pointers during cleanup
Vittorio Giovara [Sun, 9 Mar 2014 17:52:40 +0000 (18:52 +0100)]
jpeg2000: fix dereferencing invalid pointers during cleanup

CC: libav-stable@libav.org
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoffprobe: add color_range and color_space to stream output
Tobias Rapp [Tue, 17 Jun 2014 07:01:07 +0000 (09:01 +0200)]
ffprobe: add color_range and color_space to stream output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lzo: allow selecting the compression function in the test code
Michael Niedermayer [Mon, 23 Jun 2014 22:32:34 +0000 (00:32 +0200)]
avutil/lzo: allow selecting the compression function in the test code

5 years agolibavcodec/wmalosslessdec: add missing emms
Michael Niedermayer [Mon, 23 Jun 2014 21:45:20 +0000 (23:45 +0200)]
libavcodec/wmalosslessdec: add missing emms

prevent failure with mmx2
should fix fate failure on freebsd mmx2 client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopixfmt: mark the reserved values
Vittorio Giovara [Mon, 23 Jun 2014 21:39:03 +0000 (17:39 -0400)]
pixfmt: mark the reserved values

5 years agox86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm
James Almer [Mon, 23 Jun 2014 20:01:03 +0000 (17:01 -0300)]
x86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm

It's still a dsputil function

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'
Michael Niedermayer [Mon, 23 Jun 2014 18:59:48 +0000 (20:59 +0200)]
Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
  dsputil: Split off global motion compensation bits into a separate context

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f23d26a6864128001b03876b0b92fffe131f2060'
Michael Niedermayer [Mon, 23 Jun 2014 18:34:25 +0000 (20:34 +0200)]
Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060'

* commit 'f23d26a6864128001b03876b0b92fffe131f2060':
  h264: avoid using uninitialized memory in NEON chroma mc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Split off global motion compensation bits into a separate context
Diego Biurrun [Fri, 24 Jan 2014 09:41:12 +0000 (01:41 -0800)]
dsputil: Split off global motion compensation bits into a separate context

5 years agoh264: avoid using uninitialized memory in NEON chroma mc
Janne Grunau [Wed, 18 Jun 2014 15:10:42 +0000 (17:10 +0200)]
h264: avoid using uninitialized memory in NEON chroma mc

Adapt commit 982b596ea6640bfe218a31f6c3fc542d9fe61c31 for the arm and
aarch64 NEON asm. 5-10% faster on Cortex-A9.

5 years agoMerge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996'
Michael Niedermayer [Mon, 23 Jun 2014 12:48:38 +0000 (14:48 +0200)]
Merge commit 'ccda51b14c0fcae2fad73a24872dce75a7964996'

* commit 'ccda51b14c0fcae2fad73a24872dce75a7964996':
  lzo: Handle integer overflow

Conflicts:
libavutil/lzo.c

This is basically not merging changes due to this being fixed differently
in FFmpeg

See: d6af26c55c1ea30f85a7d9edbc373f53be1743ee
See: cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lzo: add asserts to be double sure against overflows
Michael Niedermayer [Mon, 23 Jun 2014 12:45:47 +0000 (14:45 +0200)]
avutil/lzo: add asserts to be double sure against overflows

These asserts cannot fail since d6af26c55c1ea30f85a7d9edbc373f53be1743ee

Based-on: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/lzo: Fix integer overflow
Michael Niedermayer [Fri, 20 Jun 2014 01:15:28 +0000 (03:15 +0200)]
avutil/lzo: Fix integer overflow

Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)

Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb@securitymouse.com>
See: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'
Michael Niedermayer [Mon, 23 Jun 2014 11:54:17 +0000 (13:54 +0200)]
Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'

* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
  indeo45: use is_indeo4 context flag instead of checking codec ID

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'
Michael Niedermayer [Mon, 23 Jun 2014 11:23:41 +0000 (13:23 +0200)]
Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'

* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765':
  dsputil: Split bswap*_buf() off into a separate context

Conflicts:
configure
libavcodec/4xm.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/apedec.c
libavcodec/eamad.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/huffyuvdec.c
libavcodec/motionpixels.c
libavcodec/truemotion2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolzo: Handle integer overflow
Luca Barbato [Thu, 19 Jun 2014 21:26:58 +0000 (23:26 +0200)]
lzo: Handle integer overflow

get_len can overflow for specially crafted payload.

Reported-By: Don A. Baley <donb@securitymouse.com>
CC: libav-stable@libav.org
5 years agoindeo45: use is_indeo4 context flag instead of checking codec ID
Dirk Ausserhaus [Fri, 20 Jun 2014 18:15:20 +0000 (20:15 +0200)]
indeo45: use is_indeo4 context flag instead of checking codec ID

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
5 years agoMerge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'
Michael Niedermayer [Mon, 23 Jun 2014 01:48:30 +0000 (03:48 +0200)]
Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'

* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e':
  mpeg: Split error resilience bits off into a separate file

Conflicts:
configure
libavcodec/Makefile
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'
Michael Niedermayer [Mon, 23 Jun 2014 01:34:13 +0000 (03:34 +0200)]
Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'

* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
libavformat/mp3enc.c

See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'
Michael Niedermayer [Mon, 23 Jun 2014 01:05:02 +0000 (03:05 +0200)]
Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'

* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
  Check if an mp3 header is using a reserved sample rate.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Split bswap*_buf() off into a separate context
Diego Biurrun [Thu, 13 Feb 2014 16:57:05 +0000 (17:57 +0100)]
dsputil: Split bswap*_buf() off into a separate context

5 years agompeg: Split error resilience bits off into a separate file
Diego Biurrun [Fri, 20 Jun 2014 13:05:45 +0000 (06:05 -0700)]
mpeg: Split error resilience bits off into a separate file

5 years agoCheck mp3 header before calling avpriv_mpegaudio_decode_header().
Justin Ruggles [Sun, 22 Jun 2014 17:19:36 +0000 (13:19 -0400)]
Check mp3 header before calling avpriv_mpegaudio_decode_header().

As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.

CC:libav-stable@libav.org

5 years agoCheck if an mp3 header is using a reserved sample rate.
Justin Ruggles [Sun, 22 Jun 2014 17:11:32 +0000 (13:11 -0400)]
Check if an mp3 header is using a reserved sample rate.

Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.

Bug-Id: 705

CC:libav-stable@libav.org

5 years agox86/dsputil: remove redundant global motion compensation code
James Almer [Sun, 22 Jun 2014 23:34:14 +0000 (20:34 -0300)]
x86/dsputil: remove redundant global motion compensation code

The SSE version has been no different than the mmx one since commit a41bf09d

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/apedec: optimize sign combination
Michael Niedermayer [Mon, 23 Jun 2014 00:04:44 +0000 (02:04 +0200)]
avcodec/apedec: optimize sign combination

48078630 -> 32533850 dezi cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'
Michael Niedermayer [Sun, 22 Jun 2014 23:30:35 +0000 (01:30 +0200)]
Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'

* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
configure
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'
Michael Niedermayer [Sun, 22 Jun 2014 23:20:55 +0000 (01:20 +0200)]
Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'

* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
  libx264: Correctly manage constant rate factor params

Conflicts:
libavcodec/libx264.c

See: 3a1c8951bc886e8af30e09dc0e20491f6f5c3937
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '73953df71a28e94d8959facba7906cf5975ca4ef'
Michael Niedermayer [Sun, 22 Jun 2014 23:13:52 +0000 (01:13 +0200)]
Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'

* commit '73953df71a28e94d8959facba7906cf5975ca4ef':
  Replace av_malloc() and memset(0) by av_mallocz()

Conflicts:
libavformat/matroskadec.c
libavformat/rmdec.c
libavformat/utils.c

No change, as none of the split malloc+memset existed in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'
Michael Niedermayer [Sun, 22 Jun 2014 23:03:21 +0000 (01:03 +0200)]
Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'

* commit 'f83896abda1e78ebbbda0f184b682b4fabadc682':
  ape: Replace memset(0) by zero initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'
Michael Niedermayer [Sun, 22 Jun 2014 22:57:41 +0000 (00:57 +0200)]
Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'

* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
  mpeg: Mark ff_mpeg_set_erpic() static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a6a675a79287565c3c23455439b114676b63a96c'
Michael Niedermayer [Sun, 22 Jun 2014 22:51:54 +0000 (00:51 +0200)]
Merge commit 'a6a675a79287565c3c23455439b114676b63a96c'

* commit 'a6a675a79287565c3c23455439b114676b63a96c':
  configure: Drop stray error resilience dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'
Michael Niedermayer [Sun, 22 Jun 2014 22:45:58 +0000 (00:45 +0200)]
Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'
Michael Niedermayer [Sun, 22 Jun 2014 22:39:53 +0000 (00:39 +0200)]
Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'

* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
  build: Have the eatqi decoder depend on the MPEG-1 decoder

Conflicts:
configure

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