ffmpeg.git
5 years agoMerge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'
Michael Niedermayer [Fri, 5 Dec 2014 22:49:56 +0000 (23:49 +0100)]
Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'

* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9':
  APIchanges: mark the release 11 branch point

Conflicts:
doc/APIchanges

Not merged as the contents in our APIchanges differ and it could be confusing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/options: don't copy priv context when it is not AVOption object
Lukasz Marek [Tue, 2 Dec 2014 22:24:15 +0000 (23:24 +0100)]
lavc/options: don't copy priv context when it is not AVOption object

This prevents potential crash when opt API is used without a class.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
Michael Niedermayer [Fri, 5 Dec 2014 22:23:25 +0000 (23:23 +0100)]
Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'

* commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff':
  mkv: Validate ASS Start and End fields

Conflicts:
libavformat/matroskaenc.c

No change as the changed code is not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'
Michael Niedermayer [Fri, 5 Dec 2014 22:20:01 +0000 (23:20 +0100)]
Merge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'

* commit '7834a54c66d46471b246b411627efe2e8ef9dd47':
  configure: enable vda hwaccel by default

Conflicts:
configure

See: 942cded690bc6dc931c60078f39cf0f339a89058
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '894545cb717427a47f800dc7738b923afde139a6'
Michael Niedermayer [Fri, 5 Dec 2014 22:07:47 +0000 (23:07 +0100)]
Merge commit '894545cb717427a47f800dc7738b923afde139a6'

* commit '894545cb717427a47f800dc7738b923afde139a6':
  mpegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails

See: cfce6f7efd28130bf0dd409b2367ca0f8c9b2417
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7a38987f245e3c280d81442f207b983333b6233c'
Michael Niedermayer [Fri, 5 Dec 2014 22:06:36 +0000 (23:06 +0100)]
Merge commit '7a38987f245e3c280d81442f207b983333b6233c'

* commit '7a38987f245e3c280d81442f207b983333b6233c':
  mpegvideo: free_context_frame() cannot fail, make it return void

See: 94c61cd9aede4c0b57632d524a725c2dda719eb3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'
Michael Niedermayer [Fri, 5 Dec 2014 21:46:46 +0000 (22:46 +0100)]
Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'

* commit 'c45eeb2dbf42382d335da8068231a8026c08843b':
  mpegvideo: replace assert about interlaced EC with debug av_log()

Conflicts:
libavcodec/mpegvideo.c

See: c88bbc01eb7f67f7399fb89800bf1bfc89edb248
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'
Michael Niedermayer [Fri, 5 Dec 2014 21:19:55 +0000 (22:19 +0100)]
Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'

* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
  mpeg12dec: Use more specific error codes

Conflicts:
libavcodec/mpeg12dec.c

See: 1852b2a0f497d3c5437d5b50379d7874fc8c285a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'
Michael Niedermayer [Fri, 5 Dec 2014 21:07:21 +0000 (22:07 +0100)]
Merge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'

* commit 'b56afb48aecb96e03347f5b569f16a64147c18b1':
  mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

Conflicts:
libavcodec/mpeg12dec.c

See: 88b4c1a7316cf47f68bf04accf613375b7326992
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'
Michael Niedermayer [Fri, 5 Dec 2014 20:55:44 +0000 (21:55 +0100)]
Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'

* commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d':
  exr: Add a gamma flag to exr loader to avoid banding

Conflicts:
libavcodec/exr.c

See: cd3daad77ea420f3373d3c5feee46825d235cccc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'
Michael Niedermayer [Fri, 5 Dec 2014 20:41:53 +0000 (21:41 +0100)]
Merge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'

* commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3':
  h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

See: 949057c95879e601bd33c8a42eeca39ced2b9a2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'
Michael Niedermayer [Fri, 5 Dec 2014 20:39:41 +0000 (21:39 +0100)]
Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'

* commit '56de2897a68e3a8795b0b3c593dad1c5832696e0':
  h264: Fix memory leak on ff_h264_decode_init() failure

Conflicts:
libavcodec/h264.c

See: 309a931a38b42c0a635f096cdbea9c21c5e54eab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: Pass context to av_log()
Michael Niedermayer [Fri, 5 Dec 2014 19:30:03 +0000 (20:30 +0100)]
avcodec/dvbsubdec: Pass context to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/golomb: use NULL for pointers instead of 0
Michael Niedermayer [Fri, 5 Dec 2014 19:27:04 +0000 (20:27 +0100)]
avcodec/golomb: use NULL for pointers instead of 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples/filtering_video: fix frame rate
Piotr Fusik [Fri, 5 Dec 2014 14:47:05 +0000 (15:47 +0100)]
doc/examples/filtering_video: fix frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: fix Opus stream count
Rafaël Carré [Fri, 5 Dec 2014 13:33:58 +0000 (14:33 +0100)]
avformat/mpegts: fix Opus stream count

That number represents the number of streams, not the number of channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudiodec_template: only allocate fdsp when its used
Michael Niedermayer [Fri, 5 Dec 2014 03:27:49 +0000 (04:27 +0100)]
avcodec/mpegaudiodec_template: only allocate fdsp when its used

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/libxvid: workaround for bug in libxvidcore
Lukasz Marek [Mon, 24 Nov 2014 00:12:06 +0000 (01:12 +0100)]
lavc/libxvid: workaround for bug in libxvidcore

libxvidcore calculate number of threads basing on video height.
If height is small enough it allocates 0 bytes long memory and
writes to it.
Setting thread_count to 0 uses 1 thread and skips bugged code.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence group...
Mark Reid [Wed, 3 Dec 2014 00:43:52 +0000 (16:43 -0800)]
libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence group hack

I think this is a better way to deal with single frame essence data then my
previous way.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoreplaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers
Steve Jiekak [Thu, 4 Dec 2014 13:48:15 +0000 (14:48 +0100)]
replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers

Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoadd av_dv_codec_profile2 : uses framerate to select best matching profile. default...
Steve Jiekak [Thu, 4 Dec 2014 13:48:14 +0000 (14:48 +0100)]
add av_dv_codec_profile2 : uses framerate to select best matching profile. default on first matching profile

Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples/transcoding: check encoder before using it
Michael Niedermayer [Thu, 4 Dec 2014 17:58:38 +0000 (18:58 +0100)]
doc/examples/transcoding: check encoder before using it

Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/imc: only check remaining bits in case bits will be read
Michael Niedermayer [Thu, 4 Dec 2014 17:17:17 +0000 (18:17 +0100)]
avcodec/imc: only check remaining bits in case bits will be read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoimc: make issue non-fatal
Christophe Gisquet [Wed, 3 Dec 2014 23:04:50 +0000 (00:04 +0100)]
imc: make issue non-fatal

The "faulty" samples actually sound fine when ignoring this issue.

For ticket #3886, more samples are decoded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: use memcpy instead of byte loops for P frames.
Benoit Fouet [Wed, 3 Dec 2014 13:31:28 +0000 (14:31 +0100)]
avcodec/pngdec: use memcpy instead of byte loops for P frames.

Rely on the way memcpy is optimized for one's system instead of looping
on a byte buffer for buffer copies to handle P frames.

Tested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add 2.5
Michael Niedermayer [Thu, 4 Dec 2014 13:24:59 +0000 (14:24 +0100)]
MAINTAINERS: add 2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_...
Rong Yan [Thu, 4 Dec 2014 10:34:02 +0000 (10:34 +0000)]
avcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_epel_v_altivec_core() put_vp8_pixels16_altivec() add marcos GET_PIXHL() GET_OUTER() LOAD_HL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()
Rong Yan [Thu, 4 Dec 2014 05:51:30 +0000 (05:51 +0000)]
avcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE: Bump
Timothy Gu [Thu, 4 Dec 2014 04:15:20 +0000 (20:15 -0800)]
RELEASE: Bump

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: reduce noisiness of missing channel elements
Michael Niedermayer [Thu, 4 Dec 2014 00:47:55 +0000 (01:47 +0100)]
avcodec/aacdec: reduce noisiness of missing channel elements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 4 Dec 2014 00:47:46 +0000 (01:47 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix standalone compilation of the iec61883 input device.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of the iec61883 input device.
Carl Eugen Hoyos [Thu, 4 Dec 2014 00:35:47 +0000 (01:35 +0100)]
Fix standalone compilation of the iec61883 input device.

5 years agodoc/APIchanges: add 2.5 cut marker
Michael Niedermayer [Thu, 4 Dec 2014 00:28:40 +0000 (01:28 +0100)]
doc/APIchanges: add 2.5 cut marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add 2.5 entry n2.6-dev
Michael Niedermayer [Thu, 4 Dec 2014 00:28:06 +0000 (01:28 +0100)]
Changelog: add 2.5 entry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix indentation in handle_row()
Benoit Fouet [Wed, 3 Dec 2014 13:16:57 +0000 (14:16 +0100)]
avcodec/pngdec: fix indentation in handle_row()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix mem leak in init()
Benoit Fouet [Wed, 3 Dec 2014 13:16:56 +0000 (14:16 +0100)]
avcodec/pngdec: fix mem leak in init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/pngdec: support 'previous' dispose operation for APNG.
Benoit Fouet [Wed, 3 Dec 2014 13:16:55 +0000 (14:16 +0100)]
libavcodec/pngdec: support 'previous' dispose operation for APNG.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_i386: Fix operand size
Reimar Döffinger [Wed, 3 Dec 2014 21:39:00 +0000 (22:39 +0100)]
h264_i386: Fix operand size

Fixes fate failure on macosx clang x86-64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE_NOTES: update for 2.5
Michael Niedermayer [Wed, 3 Dec 2014 20:55:34 +0000 (21:55 +0100)]
RELEASE_NOTES: update for 2.5

If you spot something missing wrong or improvable, do not hesitate
to push fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in hashes and dates
Michael Niedermayer [Wed, 3 Dec 2014 20:51:28 +0000 (21:51 +0100)]
doc/APIchanges: fill in hashes and dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: Add libpostproc visualization
Michael Niedermayer [Wed, 3 Dec 2014 20:42:03 +0000 (21:42 +0100)]
Changelog: Add libpostproc visualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/oggenc: use meaningful error codes
Lukasz Marek [Tue, 2 Dec 2014 23:35:51 +0000 (00:35 +0100)]
lavf/oggenc: use meaningful error codes

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoswscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Michael Niedermayer [Wed, 3 Dec 2014 19:21:56 +0000 (20:21 +0100)]
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: Check codec_data_size
Michael Niedermayer [Wed, 3 Dec 2014 19:01:18 +0000 (20:01 +0100)]
avformat/rmdec: Check codec_data_size

Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: Fix infinite loop in ff_get_line()
Michael Niedermayer [Wed, 3 Dec 2014 18:05:56 +0000 (19:05 +0100)]
avformat/aviobuf: Fix infinite loop in ff_get_line()

Fixes ticket4152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/decklink_common: fix COM initialization failure check
Jonathan Baecker [Wed, 3 Dec 2014 15:41:41 +0000 (16:41 +0100)]
avdevice/decklink_common: fix COM initialization failure check

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAPIchanges: mark the release 11 branch point
wm4 [Wed, 3 Dec 2014 14:01:49 +0000 (15:01 +0100)]
APIchanges: mark the release 11 branch point

5 years agoavcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:46:33 +0000 (14:46 +0100)]
avcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:43:40 +0000 (14:43 +0100)]
avcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:39:43 +0000 (14:39 +0100)]
avcodec/opusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomkv: Validate ASS Start and End fields
Luca Barbato [Wed, 29 Oct 2014 19:39:46 +0000 (20:39 +0100)]
mkv: Validate ASS Start and End fields

CC: libav-stable@libav.org
5 years agoconfigure: enable vda hwaccel by default
Vittorio Giovara [Wed, 3 Dec 2014 03:12:40 +0000 (03:12 +0000)]
configure: enable vda hwaccel by default

Following the old thread suggestions.
Vittorio

5 years agompegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails
Michael Niedermayer [Mon, 24 Nov 2014 17:05:04 +0000 (17:05 +0000)]
mpegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agompegvideo: free_context_frame() cannot fail, make it return void
Michael Niedermayer [Mon, 24 Nov 2014 17:05:03 +0000 (17:05 +0000)]
mpegvideo: free_context_frame() cannot fail, make it return void

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: replace assert about interlaced EC with debug av_log()
Michael Niedermayer [Mon, 24 Nov 2014 17:05:02 +0000 (17:05 +0000)]
mpegvideo: replace assert about interlaced EC with debug av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg12dec: Use more specific error codes
Michael Niedermayer [Mon, 24 Nov 2014 17:05:00 +0000 (17:05 +0000)]
mpeg12dec: Use more specific error codes

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agompeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()
Michael Niedermayer [Mon, 24 Nov 2014 17:04:58 +0000 (17:04 +0000)]
mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopngdsp x86: use unaligned access
Christophe Gisquet [Tue, 2 Dec 2014 13:31:49 +0000 (14:31 +0100)]
pngdsp x86: use unaligned access

For test images manually generated to contain only up prediction,
timing results:
         8380x3032    255x185
before:   138635       1992
after:    139232       1996

Actually jumping to the proper version depending on the alignment:
8380x3032: 138767

A 0.5% speed improvement for gigantic images is not worth the code
duplication.

Fixes ticket #4148

Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Tested-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoexr: Add a gamma flag to exr loader to avoid banding
Gonzalo Garramuno [Tue, 2 Dec 2014 16:48:25 +0000 (16:48 +0000)]
exr: Add a gamma flag to exr loader to avoid banding

This is needed to avoid banding artifacts when gammaing the picture.
Currently, if done with a video filter, the process is done on uints
instead of full float.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoh264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails
Michael Niedermayer [Tue, 2 Dec 2014 16:47:56 +0000 (16:47 +0000)]
h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

CC: libav-devel@libav.org
5 years agoh264: Fix memory leak on ff_h264_decode_init() failure
Dale Curtis [Tue, 2 Dec 2014 16:47:55 +0000 (16:47 +0000)]
h264: Fix memory leak on ff_h264_decode_init() failure

CC: libav-devel@libav.org
5 years agoffmpeg: drop usage of coded_frame
Michael Niedermayer [Wed, 3 Dec 2014 02:06:43 +0000 (03:06 +0100)]
ffmpeg: drop usage of coded_frame

It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/decklink_common: fix heap corruption run time error
Jonathan Baecker [Tue, 2 Dec 2014 19:10:41 +0000 (20:10 +0100)]
avdevice/decklink_common: fix heap corruption run time error

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoSupport muxing 4k AVC Intra in mov.
Carl Eugen Hoyos [Tue, 2 Dec 2014 22:35:40 +0000 (23:35 +0100)]
Support muxing 4k AVC Intra in mov.

Reported and tested by Rens Dijkshoorn, rens onlinemedia nl

5 years agoMerge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'
Michael Niedermayer [Tue, 2 Dec 2014 21:55:14 +0000 (22:55 +0100)]
Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'

* commit '2e0935965b824bc641b7e0bafafcbb1e36027f79':
  Drop the unofficial extension prefix for MPEG and MPEG-TS formats

See: fdcb2873e1c898cf26216f7e80d95d03387ba55b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
Michael Niedermayer [Tue, 2 Dec 2014 21:53:22 +0000 (22:53 +0100)]
Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'

* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
libavformat/mpegtsenc.c

See: e2baaa21aabc7edb3c2275eac39ed1d40884b25a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
Michael Niedermayer [Tue, 2 Dec 2014 21:39:01 +0000 (22:39 +0100)]
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'

* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
libavformat/mpegtsenc.c

See: 09a858da7d5535e78e9cf942a468aec411ffbf19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '26e20dfd06ac62da596a9549867f990f1200a04e'
Michael Niedermayer [Tue, 2 Dec 2014 21:34:06 +0000 (22:34 +0100)]
Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'

* commit '26e20dfd06ac62da596a9549867f990f1200a04e':
  options_table: fix colorspace minimum option value

See: 8c28a39c2c38fd9d13dc5247fca7bca8b3f2fcad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'
Michael Niedermayer [Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)]
Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'

* commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09':
  mov: allocate the tag value dynamically

Conflicts:
libavformat/mov.c

See: f31445a82d6acd0b8fab5a26c04e91645f4854d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'
Michael Niedermayer [Tue, 2 Dec 2014 21:00:02 +0000 (22:00 +0100)]
Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'

* commit 'e352b293712ff7cbde67eba3ce3f8510b037de09':
  mov: Add an option for exporting all metadata

Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver_config: print warning when using default value
Lukasz Marek [Wed, 26 Nov 2014 18:41:24 +0000 (19:41 +0100)]
ffserver_config: print warning when using default value

Some of the defaults may be harmful (like buffer size).
It is good user is aware of that.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver_config: set defaults basing on absence of set value
Lukasz Marek [Wed, 26 Nov 2014 18:08:18 +0000 (19:08 +0100)]
ffserver_config: set defaults basing on absence of set value

This prevents the situation when user set option to 0 and ffserver
threats it as not set value, so applies the default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver_config: remove useless defaults
Lukasz Marek [Wed, 26 Nov 2014 17:54:16 +0000 (18:54 +0100)]
ffserver_config: remove useless defaults

Options are already set to its defaults by AVOption API.
The only difference is for qmin, new default is 2, ffserver set to 3.
It is dead code because if condition is not meet unless user set option to 0.
Meeting condition would mean that ffserver overwrites explicity set option.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver: use avcodec_copy_context to copy context
Lukasz Marek [Sat, 22 Nov 2014 01:33:29 +0000 (02:33 +0100)]
ffserver: use avcodec_copy_context to copy context

Copying context using dedicated function is safer that raw memcpy
which creates shallow copy.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '5639ed9abb58311f82cf3499b682d228290adb09'
Michael Niedermayer [Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)]
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'

* commit '5639ed9abb58311f82cf3499b682d228290adb09':
  mov: do not truncate the language-prefixed tag

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'
Michael Niedermayer [Tue, 2 Dec 2014 20:39:05 +0000 (21:39 +0100)]
Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'

* commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3':
  rtsp: move the CONFIG_ macros to the beginning of the check

Conflicts:
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
Michael Niedermayer [Tue, 2 Dec 2014 20:29:48 +0000 (21:29 +0100)]
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'

* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
  aac: Simplify decode_mid_side_stereo

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 2 Dec 2014 18:48:01 +0000 (19:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  configure: add a note about pkg-config --static.
  configure: add optional pkg-config helper and use it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Tue, 2 Dec 2014 18:16:02 +0000 (19:16 +0100)]
avcodec/aacdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "avfilter/vf_interlace: more accurate pts calculation"
Michael Niedermayer [Tue, 2 Dec 2014 17:48:03 +0000 (18:48 +0100)]
Revert "avfilter/vf_interlace: more accurate pts calculation"

This reverts commit df8248f66e362c3015d95ac86d1917dde8dc0a0c.

the revert produces a timebase and timestamps that are more close
to what users expect

Hoped-by: koda
5 years agoconfigure: add a note about pkg-config --static.
Nicolas George [Tue, 2 Dec 2014 12:54:46 +0000 (13:54 +0100)]
configure: add a note about pkg-config --static.

Try to detect "$cc -static" without "pkg-config --static".
Also, when a library detection using pkg-config fails,
make it explicit this was pkg-config.

5 years agoconfigure: add optional pkg-config helper and use it.
Nicolas George [Tue, 2 Dec 2014 12:29:47 +0000 (13:29 +0100)]
configure: add optional pkg-config helper and use it.

The require variant dies if the package is not present.
The check variant does not import the flags to the used list.
The new variant imports the flags if the package is present
but does not die if it is not.
The new call graph is: require -> use -> check.

Use use_pkg_config for libx264 and libsmbclient: more readable
and three external call less per library.

5 years agoavfilter/vf_tinterlace: Favor using standard timebases for the output
Michael Niedermayer [Mon, 1 Dec 2014 19:52:10 +0000 (20:52 +0100)]
avfilter/vf_tinterlace: Favor using standard timebases for the output

Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_in...
Rong Yan [Tue, 2 Dec 2014 07:37:11 +0000 (07:37 +0000)]
avcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_int16_altivec()

adds macro GET_T()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDrop the unofficial extension prefix for MPEG and MPEG-TS formats
Florent Le Coz [Sat, 29 Nov 2014 16:53:47 +0000 (17:53 +0100)]
Drop the unofficial extension prefix for MPEG and MPEG-TS formats

As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003

CC: libav-stable@libav.org
5 years agompegtsenc: recognize .mts as MPEG Transport Stream
Jean-Baptiste Mardelle [Sat, 29 Nov 2014 16:53:46 +0000 (17:53 +0100)]
mpegtsenc: recognize .mts as MPEG Transport Stream

5 years agoAdd support for BDAV/m2ts-mode muxing
Fredrik Axelsson [Sat, 29 Nov 2014 16:53:45 +0000 (17:53 +0100)]
Add support for BDAV/m2ts-mode muxing

Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agooptions_table: fix colorspace minimum option value
Jon Morley [Mon, 10 Nov 2014 18:43:42 +0000 (10:43 -0800)]
options_table: fix colorspace minimum option value

The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.

5 years agomov: allocate the tag value dynamically
Thilo Borgmann [Sat, 29 Nov 2014 16:51:14 +0000 (17:51 +0100)]
mov: allocate the tag value dynamically

This allows to load metadata entries longer than 1024 bytes.
Displaying them is still limited to 1024 characters, but applications
can load them fully now.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agomov: Add an option for exporting all metadata
Vittorio Giovara [Sat, 29 Nov 2014 16:51:13 +0000 (17:51 +0100)]
mov: Add an option for exporting all metadata

5 years agomov: do not truncate the language-prefixed tag
Vittorio Giovara [Sat, 29 Nov 2014 16:51:12 +0000 (17:51 +0100)]
mov: do not truncate the language-prefixed tag

5 years agortsp: move the CONFIG_ macros to the beginning of the check
Vittorio Giovara [Sat, 29 Nov 2014 16:39:41 +0000 (17:39 +0100)]
rtsp: move the CONFIG_ macros to the beginning of the check

With --disable-optimizations, the DCE of some compilers does not remove
such unused code, causing linking failure.

5 years agoaac: Simplify decode_mid_side_stereo
Luca Barbato [Fri, 21 Nov 2014 12:57:36 +0000 (12:57 +0000)]
aac: Simplify decode_mid_side_stereo

Might spare few cycles if the compiler is naive and
makes the function more readable.

5 years agoavformat/apngdec: exit probing when skipping is not possible.
Benoit Fouet [Tue, 2 Dec 2014 10:24:21 +0000 (11:24 +0100)]
avformat/apngdec: exit probing when skipping is not possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoapng: move shared header from avformat to avcodec.
Benoit Fouet [Tue, 2 Dec 2014 08:21:47 +0000 (09:21 +0100)]
apng: move shared header from avformat to avcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/qcp: Print unknown GUID on error.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:40:01 +0000 (11:40 +0100)]
lavf/qcp: Print unknown GUID on error.

5 years agoAlso print GUIDs as shown in the Windows registry to ease debugging.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:39:06 +0000 (11:39 +0100)]
Also print GUIDs as shown in the Windows registry to ease debugging.

5 years agolavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:36:48 +0000 (11:36 +0100)]
lavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.

Fixes ticket #3544.

5 years agotests: Add vsynth2 which uses the new reference.pnm
Michael Niedermayer [Sun, 30 Nov 2014 18:28:42 +0000 (19:28 +0100)]
tests: Add vsynth2 which uses the new reference.pnm

The file is already present in git and by using it we can perform more tests
without the need of fate samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests: Rename vsynth2 to vsynth_lena
Michael Niedermayer [Sun, 30 Nov 2014 18:47:45 +0000 (19:47 +0100)]
tests: Rename vsynth2 to vsynth_lena

This avoids confusion with a growing number of vsynth tests

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