ffmpeg.git
5 years agoMerge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
Michael Niedermayer [Sun, 13 Apr 2014 01:01:03 +0000 (03:01 +0200)]
Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'

* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
libavcodec/tiff.c

See: 1ec83d9a9e472f485897ac92bad9631d551a8c5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5748faf291fec297ef25d81962b52b3438f54278'
Michael Niedermayer [Sun, 13 Apr 2014 00:05:50 +0000 (02:05 +0200)]
Merge commit '5748faf291fec297ef25d81962b52b3438f54278'

* commit '5748faf291fec297ef25d81962b52b3438f54278':
  bytestream: add bytestream2_copy_buffer() functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783'
Michael Niedermayer [Sun, 13 Apr 2014 00:04:33 +0000 (02:04 +0200)]
Merge commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783'

* commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783':
  bytestream: add functions for accessing size of buffer

See: 0ee5be4ee480c59d5f0e384566992795a5bb7ff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '58bc38a5f224d29b79338200459792c765c25fd5'
Michael Niedermayer [Sun, 13 Apr 2014 00:01:10 +0000 (02:01 +0200)]
Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'

* commit '58bc38a5f224d29b79338200459792c765c25fd5':
  tiffdec: use correct data type for palette entries and set alpha to 0xFF

Conflicts:
libavcodec/tiff.c

See: dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bf2064f046af64c59a416c814474a39b0a457569'
Michael Niedermayer [Sat, 12 Apr 2014 23:48:43 +0000 (01:48 +0200)]
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'

* commit 'bf2064f046af64c59a416c814474a39b0a457569':
  tiffdec: rename variables for consistency and fix variable shadowing

Conflicts:
libavcodec/tiff.c

See: 251345a3fe221d60e9b275567085f9475de68092
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
Michael Niedermayer [Sat, 12 Apr 2014 23:44:27 +0000 (01:44 +0200)]
Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'

* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801':
  swscale: Set alpha to opaque for internal palettes.

Conflicts:
libswscale/swscale_unscaled.c

See: dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'
Michael Niedermayer [Sat, 12 Apr 2014 23:39:31 +0000 (01:39 +0200)]
Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'

* commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915':
  swscale: fix some undefined signed left shifts

Conflicts:
libswscale/swscale_unscaled.c

See: 7a32ab5ed0b0523d1868da8232ff15831712a18f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'
Michael Niedermayer [Sat, 12 Apr 2014 23:26:49 +0000 (01:26 +0200)]
Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
  swscale: fix an implementation-defined unsigned-to-signed conversion

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sat, 12 Apr 2014 22:50:34 +0000 (00:50 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/qtkit: add device category
  lavd/fbdev_enc: implement get_device_list
  lavd: no default device unless explicitly set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'
Michael Niedermayer [Sat, 12 Apr 2014 22:37:32 +0000 (00:37 +0200)]
Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

Conflicts:
doc/filters.texi
doc/libavfilter.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
Michael Niedermayer [Sat, 12 Apr 2014 19:12:42 +0000 (21:12 +0200)]
Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'

* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
libavformat/mp3enc.c

See: 40176fc3149bc72c1309f93989a57aec2322e626
See: d62bf5d4e73250295c0a652e151498c5b19cbd63
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotiffdec: use bytestream2 to simplify overread/overwrite protection
Justin Ruggles [Sun, 29 Sep 2013 23:47:55 +0000 (19:47 -0400)]
tiffdec: use bytestream2 to simplify overread/overwrite protection

Based on a patch by Paul B Mahol <onemda@gmail.com>

CC:libav-stable@libav.org

5 years agobytestream: add bytestream2_copy_buffer() functions
Justin Ruggles [Sun, 29 Sep 2013 23:45:57 +0000 (19:45 -0400)]
bytestream: add bytestream2_copy_buffer() functions

This is basically an overread/overwrite-safe memcpy between a
GetByteContext and a PutByteContext.

CC:libav-stable@libav.org

5 years agobytestream: add functions for accessing size of buffer
Paul B Mahol [Wed, 21 Mar 2012 00:10:18 +0000 (00:10 +0000)]
bytestream: add functions for accessing size of buffer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

5 years agotiffdec: use correct data type for palette entries and set alpha to 0xFF
Justin Ruggles [Sat, 28 Sep 2013 16:20:19 +0000 (12:20 -0400)]
tiffdec: use correct data type for palette entries and set alpha to 0xFF

5 years agotiffdec: rename variables for consistency and fix variable shadowing
Jean First [Fri, 23 Sep 2011 06:22:31 +0000 (08:22 +0200)]
tiffdec: rename variables for consistency and fix variable shadowing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
5 years agoavutil/log: add av_log_get_flags()
Michael Niedermayer [Thu, 20 Mar 2014 02:53:22 +0000 (03:53 +0100)]
avutil/log: add av_log_get_flags()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: Set alpha to opaque for internal palettes.
Justin Ruggles [Sat, 5 Apr 2014 18:14:30 +0000 (14:14 -0400)]
swscale: Set alpha to opaque for internal palettes.

Fixes conversion of pal8 to rgb formats with alpha.

Updated references for 2 FATE tests which previously encoded fully
transparent images.

Based on a patch by Baptiste Coudurier <baptiste.coudurier@gmail.com>

5 years agolavd/qtkit: add device category
Lukasz Marek [Fri, 11 Apr 2014 14:29:37 +0000 (16:29 +0200)]
lavd/qtkit: add device category

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/fbdev_enc: implement get_device_list
Lukasz Marek [Sat, 12 Apr 2014 17:25:33 +0000 (19:25 +0200)]
lavd/fbdev_enc: implement get_device_list

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoswscale: fix some undefined signed left shifts
Justin Ruggles [Sat, 5 Apr 2014 18:46:22 +0000 (14:46 -0400)]
swscale: fix some undefined signed left shifts

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

5 years agoswscale: fix an implementation-defined unsigned-to-signed conversion
Justin Ruggles [Sat, 5 Apr 2014 18:05:19 +0000 (14:05 -0400)]
swscale: fix an implementation-defined unsigned-to-signed conversion

5 years agolavd: no default device unless explicitly set
Lukasz Marek [Sat, 12 Apr 2014 17:05:54 +0000 (19:05 +0200)]
lavd: no default device unless explicitly set

AVDeviceInfoList was allocated with first device set as default
even though there is no device after allocation.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/ffv1: use av_malloc_array()
Michael Niedermayer [Sat, 12 Apr 2014 13:41:00 +0000 (15:41 +0200)]
avcodec/ffv1: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/faxcompr: use av_malloc_array()
Michael Niedermayer [Sat, 12 Apr 2014 13:37:57 +0000 (15:37 +0200)]
avcodec/faxcompr: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovcodec/error_resilience: use av_malloc_array()
Michael Niedermayer [Sat, 12 Apr 2014 13:33:55 +0000 (15:33 +0200)]
vcodec/error_resilience: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Libavfilter English cleanup
Katerina Barone-Adesi [Sun, 6 Apr 2014 10:32:49 +0000 (12:32 +0200)]
doc: Libavfilter English cleanup

This aims to standardize the English used in the libavfilter
documentation, describing the same thing in the same way more often,
and significantly reduce the amount of outright errors, including
run-on sentences and sentence fragments.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomp3enc: Properly write bitrate value in XING header
Michael Niedermayer [Wed, 9 Apr 2014 16:22:53 +0000 (18:22 +0200)]
mp3enc: Properly write bitrate value in XING header

Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.

Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.

Bug-Id: https://bugs.debian.org/736088

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/elbg: Use av_malloc(z)_array()
Michael Niedermayer [Sat, 12 Apr 2014 03:40:37 +0000 (05:40 +0200)]
avcodec/elbg: Use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: use av_malloc(z)_array
Michael Niedermayer [Sat, 12 Apr 2014 03:38:31 +0000 (05:38 +0200)]
avcodec/diracdec: use av_malloc(z)_array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: support nanosecond file times
Michael Niedermayer [Sat, 25 May 2013 13:34:27 +0000 (15:34 +0200)]
avformat/img2dec: support nanosecond file times

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hls: reduce memory usage by using dynamically allocated url/key
Michael Schenk [Fri, 11 Apr 2014 06:14:40 +0000 (08:14 +0200)]
avformat/hls: reduce memory usage by using dynamically allocated url/key

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
5 years agoavcodec/mpegvideo_enc: override bitrate tolerance when its value is too small
Michael Niedermayer [Fri, 11 Apr 2014 23:29:20 +0000 (01:29 +0200)]
avcodec/mpegvideo_enc: override bitrate tolerance when its value is too small

Fixes Ticket3257

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 11 Apr 2014 22:17:31 +0000 (00:17 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Improve amr bitrate calculation for VBR files.
  Warn if rawvideo and an unreadable pix_fmt are written.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpegls: print coding parameters stored in LSE
Michael Niedermayer [Fri, 11 Apr 2014 21:30:39 +0000 (23:30 +0200)]
avcodec/jpegls: print coding parameters stored in LSE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoImprove amr bitrate calculation for VBR files.
Carl Eugen Hoyos [Fri, 11 Apr 2014 21:38:53 +0000 (23:38 +0200)]
Improve amr bitrate calculation for VBR files.

Fixes ticket #3541.

5 years agoWarn if rawvideo and an unreadable pix_fmt are written.
Carl Eugen Hoyos [Fri, 11 Apr 2014 21:35:11 +0000 (23:35 +0200)]
Warn if rawvideo and an unreadable pix_fmt are written.

Print an error if a combination of rawvideo and an unusual pix_fmt
that will be impossible to decode are written to avi or mov.
Fixes ticket #3545.

5 years agoMerge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'
Michael Niedermayer [Fri, 11 Apr 2014 18:38:59 +0000 (20:38 +0200)]
Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
  resample: split linear into its own function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'be394968c81019887ef996a78a526bdd85d1e216'
Michael Niedermayer [Fri, 11 Apr 2014 18:24:06 +0000 (20:24 +0200)]
Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

* commit 'be394968c81019887ef996a78a526bdd85d1e216':
  resample: add initial padding explicitly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'
Michael Niedermayer [Fri, 11 Apr 2014 17:42:25 +0000 (19:42 +0200)]
Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'

* commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3':
  resample: drop useless abs()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'
Michael Niedermayer [Fri, 11 Apr 2014 17:34:27 +0000 (19:34 +0200)]
Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'

* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
  resample: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'
Michael Niedermayer [Fri, 11 Apr 2014 17:24:40 +0000 (19:24 +0200)]
Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'

* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
  resample: split the nearest neighbour path into a separate function pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'
Michael Niedermayer [Fri, 11 Apr 2014 17:19:15 +0000 (19:19 +0200)]
Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'

* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
  resample: fix avresample_get_delay() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd AVFoundation input device.
Thilo Borgmann [Fri, 11 Apr 2014 15:29:07 +0000 (17:29 +0200)]
Add AVFoundation input device.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoresample: split linear into its own function
Anton Khirnov [Tue, 4 Mar 2014 16:12:33 +0000 (17:12 +0100)]
resample: split linear into its own function

5 years agoresample: add initial padding explicitly
Anton Khirnov [Tue, 4 Mar 2014 15:56:01 +0000 (16:56 +0100)]
resample: add initial padding explicitly

This simplifies the code, since we do not have to deal with a possibly
negative source index anymore.

5 years agoresample: drop useless abs()
Anton Khirnov [Tue, 4 Mar 2014 11:27:17 +0000 (12:27 +0100)]
resample: drop useless abs()

negative sample_index is handled in the block above.

5 years agoresample: reindent
Anton Khirnov [Mon, 3 Mar 2014 21:28:07 +0000 (22:28 +0100)]
resample: reindent

5 years agoresample: split the nearest neighbour path into a separate function pointer
Anton Khirnov [Mon, 3 Mar 2014 21:26:57 +0000 (22:26 +0100)]
resample: split the nearest neighbour path into a separate function pointer

5 years agoresample: fix avresample_get_delay() return value
Anton Khirnov [Tue, 4 Mar 2014 20:18:27 +0000 (21:18 +0100)]
resample: fix avresample_get_delay() return value

The correct "next" input sample is not the first sample of the
resampling buffer, but the center sample of the filter_length-sized
block at the beginning.

CC:libav-stable@libav.org

5 years agolavd: add control message enums
Lukasz Marek [Wed, 9 Apr 2014 22:47:32 +0000 (00:47 +0200)]
lavd: add control message enums

Adds messages that allows to control (audio) buffer and play/pause state.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd: add device capabilities API
Lukasz Marek [Thu, 3 Apr 2014 17:11:19 +0000 (19:11 +0200)]
lavd: add device capabilities API

Provides API to query device capabilities.
Each device must implement callbacks to benefit from this API.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 11 Apr 2014 12:41:42 +0000 (14:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  DNxHD: convert inline asm to yasm

Conflicts:
libavcodec/x86/Makefile
libavcodec/x86/dnxhdenc.asm

See: 9d34dce05ba704180916433e13add3f01b54313b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
Michael Niedermayer [Fri, 11 Apr 2014 12:28:19 +0000 (14:28 +0200)]
Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'

* commit '676856204b84dfaffe329dce8502e834a0dbdb19':
  DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

Conflicts:
libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc_init.c

See: cb11b9e89e152ed4db22e5ad0349b63fac02101e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '89ef08c992c484a46711b1a68a988303679c288e'
Michael Niedermayer [Fri, 11 Apr 2014 12:04:10 +0000 (14:04 +0200)]
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'

* commit '89ef08c992c484a46711b1a68a988303679c288e':
  DNxHD: K&R formatting cosmetics

Conflicts:
libavcodec/dnxhd_parser.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDNxHD: convert inline asm to yasm
Timothy Gu [Fri, 28 Mar 2014 01:37:51 +0000 (02:37 +0100)]
DNxHD: convert inline asm to yasm

5 years agoDNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
Timothy Gu [Fri, 28 Mar 2014 01:32:09 +0000 (02:32 +0100)]
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

5 years agoDNxHD: K&R formatting cosmetics
Vittorio Giovara [Fri, 28 Mar 2014 01:02:48 +0000 (02:02 +0100)]
DNxHD: K&R formatting cosmetics

5 years agoavcodec/dnxhdenc: use av_malloc_array()
Michael Niedermayer [Fri, 11 Apr 2014 04:31:45 +0000 (06:31 +0200)]
avcodec/dnxhdenc: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Apr 2014 23:19:51 +0000 (01:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp2: Do not force a samplerate

Conflicts:
libavcodec/mpegaudioenc_template.c

Only libtwolame changes, as the forcing of a sample rate was not merged for the native mp2 encoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudioenc_template: default to 384k bitrate as default
Michael Niedermayer [Wed, 9 Apr 2014 03:18:11 +0000 (05:18 +0200)]
avcodec/mpegaudioenc_template: default to 384k bitrate as default

If 384k is too high for the samplerate, choose the closest
possible

Idea to increase the bitrate from: 46439e156219d27f059cf687743ba5aacf238b87
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomp2: Do not force a samplerate
Luca Barbato [Thu, 10 Apr 2014 22:09:34 +0000 (00:09 +0200)]
mp2: Do not force a samplerate

The default should be not to resample.

5 years agoavformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol
Anssi Hannula [Thu, 10 Apr 2014 20:50:13 +0000 (23:50 +0300)]
avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol

ffurl_seek() will not work even when it should be a no-op, so do not
call it on crypto protocol.

Also replace use of ffurl_size() for the same reason.

Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
5 years agoffmpeg: stop protocols on interrupt when no transcoding has happened yet
Michael Niedermayer [Thu, 10 Apr 2014 20:23:54 +0000 (22:23 +0200)]
ffmpeg: stop protocols on interrupt when no transcoding has happened yet

Fixes Ticket3344

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoCosmetics: Remove an outdated comment from lavc/rawdec.c.
Carl Eugen Hoyos [Thu, 10 Apr 2014 20:25:39 +0000 (22:25 +0200)]
Cosmetics: Remove an outdated comment from lavc/rawdec.c.

The missing swscale feature was implemented in 2011.

5 years agoavfilter/settb: remove duplicate #include
Michael Niedermayer [Thu, 10 Apr 2014 19:58:03 +0000 (21:58 +0200)]
avfilter/settb: remove duplicate #include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/rtspcodes: add missing header include
James Almer [Wed, 9 Apr 2014 23:53:39 +0000 (20:53 -0300)]
lavf/rtspcodes: add missing header include

Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Apr 2014 19:32:32 +0000 (21:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Only set the SAR if it is valid
  libx265: Use 16-bit SAR
  libx265: Use x265_param_parse to set the SAR

See: 8945dcbb52b6b87e1e6479912cce89c7da54ec43
See: fcc43e02d30279b2ca4c69811311aa05acab4184
See: cdd21f1f03c5d59aad8f0244b1be0f864d8416a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: merge mov_read_custom_metadata() and mov_read_custom()
Michael Niedermayer [Thu, 10 Apr 2014 19:25:51 +0000 (21:25 +0200)]
avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
Michael Niedermayer [Thu, 10 Apr 2014 18:23:40 +0000 (20:23 +0200)]
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'

* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
  mov: read hydrogenaudio replaygain information

Conflicts:
libavformat/Makefile
libavformat/mov.c

See: 37a15f3e669372075c88254e070c971aecb485aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score()
Michael Niedermayer [Thu, 10 Apr 2014 16:38:39 +0000 (18:38 +0200)]
avcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score()

This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used

It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: Only set the SAR if it is valid
Derek Buitenhuis [Thu, 10 Apr 2014 12:27:41 +0000 (13:27 +0100)]
libx265: Only set the SAR if it is valid

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Use 16-bit SAR
Derek Buitenhuis [Thu, 10 Apr 2014 12:17:48 +0000 (13:17 +0100)]
libx265: Use 16-bit SAR

The spec says it is 16 bits.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/x86: Exclude broken get_cabac under icl.
Matt Oliver [Thu, 10 Apr 2014 07:19:11 +0000 (17:19 +1000)]
avcodec/x86: Exclude broken get_cabac under icl.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 10 Apr 2014 12:36:24 +0000 (14:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h

See: ba856c0be5599f21f241162e1f5f3f2506f3132c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: Only set the SAR if it is valid
Derek Buitenhuis [Thu, 10 Apr 2014 12:27:41 +0000 (13:27 +0100)]
libx265: Only set the SAR if it is valid

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Use 16-bit SAR
Derek Buitenhuis [Thu, 10 Apr 2014 12:17:48 +0000 (13:17 +0100)]
libx265: Use 16-bit SAR

The spec says it is 16 bits.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Use x265_param_parse to set the SAR
Derek Buitenhuis [Tue, 8 Apr 2014 17:44:53 +0000 (18:44 +0100)]
libx265: Use x265_param_parse to set the SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agolibx265: Use x265_param_parse to set the SAR
Derek Buitenhuis [Tue, 8 Apr 2014 17:44:53 +0000 (18:44 +0100)]
libx265: Use x265_param_parse to set the SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agomov: read hydrogenaudio replaygain information
Anton Khirnov [Tue, 1 Apr 2014 21:22:21 +0000 (23:22 +0200)]
mov: read hydrogenaudio replaygain information

5 years agolibavfilter: Add asettb filter for setting timebase for audio
Nicolas George [Thu, 3 Apr 2014 13:42:22 +0000 (15:42 +0200)]
libavfilter: Add asettb filter for setting timebase for audio

Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agolavf/utils: fix mem leak
Lukasz Marek [Wed, 9 Apr 2014 20:43:48 +0000 (22:43 +0200)]
lavf/utils: fix mem leak

Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosws: fix warning about RGB_PACK24_B_OPERANDS redefinition
Lukasz Marek [Wed, 9 Apr 2014 20:25:43 +0000 (22:25 +0200)]
sws: fix warning about RGB_PACK24_B_OPERANDS redefinition

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 9 Apr 2014 22:33:51 +0000 (00:33 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: change some asserts to av_asserts
Michael Niedermayer [Wed, 9 Apr 2014 21:57:18 +0000 (23:57 +0200)]
avcodec/mpegvideo_enc: change some asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nut: add ff_nut_audio_extra_tags to demuxer too
Michael Niedermayer [Wed, 9 Apr 2014 21:37:55 +0000 (23:37 +0200)]
avformat/nut: add ff_nut_audio_extra_tags to demuxer too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix a typo in amr.c.
Carl Eugen Hoyos [Wed, 9 Apr 2014 20:34:04 +0000 (22:34 +0200)]
Fix a typo in amr.c.

5 years agoRemove an unneeded include of avassert.h from amr.c.
Carl Eugen Hoyos [Wed, 9 Apr 2014 20:33:29 +0000 (22:33 +0200)]
Remove an unneeded include of avassert.h from amr.c.

5 years agoDo not allow writing invalid wav channel layouts by default.
Carl Eugen Hoyos [Wed, 9 Apr 2014 20:31:40 +0000 (22:31 +0200)]
Do not allow writing invalid wav channel layouts by default.

Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543.

5 years agoavcodec/cngdec: use av_mallocz_array()
Michael Niedermayer [Wed, 9 Apr 2014 21:18:32 +0000 (23:18 +0200)]
avcodec/cngdec: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity
Michael Niedermayer [Wed, 9 Apr 2014 21:05:15 +0000 (23:05 +0200)]
avcodec/jpeglsdec/ff_jpegls_decode_lse: check len field validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: ask for sample for "oversized image"
Michael Niedermayer [Wed, 9 Apr 2014 21:03:09 +0000 (23:03 +0200)]
avcodec/jpeglsdec: ask for sample for "oversized image"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: drop confusing av_dlog()
Michael Niedermayer [Wed, 9 Apr 2014 21:02:50 +0000 (23:02 +0200)]
avcodec/mpeg12dec: drop confusing av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dirac_arith: Fix build with PIC and stack-check options
Anthoine Bourgeois [Wed, 9 Apr 2014 10:18:32 +0000 (12:18 +0200)]
avcodec/dirac_arith: Fix build with PIC and stack-check options

Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: factor "level != AV_LOG_INFO/8" checks out
Michael Niedermayer [Wed, 9 Apr 2014 14:30:16 +0000 (16:30 +0200)]
avutil/log: factor "level != AV_LOG_INFO/8" checks out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sanm: use named consant instead of literal number
Michael Niedermayer [Wed, 9 Apr 2014 14:23:57 +0000 (16:23 +0200)]
avcodec/sanm: use named consant instead of literal number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore
Michael Niedermayer [Wed, 9 Apr 2014 14:08:56 +0000 (16:08 +0200)]
avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: remove operations that have become redundant with AVFrame pointers
Michael Niedermayer [Wed, 9 Apr 2014 14:08:02 +0000 (16:08 +0200)]
avcodec/snowenc: remove operations that have become redundant with AVFrame pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 9 Apr 2014 12:36:47 +0000 (14:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: operate with pointers to AVFrames instead of whole structs

Conflicts:
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/ratecontrol.c
libavcodec/vaapi.c
libavcodec/vc1dec.c
libavcodec/vdpau_vc1.c

See: fc567ac49e17151f00f31b59030cd10f952612ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'
Michael Niedermayer [Wed, 9 Apr 2014 11:40:04 +0000 (13:40 +0200)]
Merge commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf'

* commit '60fd7d36c47d62d4c603bf16c213b1a924f5cfcf':
  fate: correctly set sample rate for mp2 tests

Conflicts:
tests/fate/acodec.mak
tests/lavf-regression.sh

one hunk has been ommited as it breaks fate

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