ffmpeg.git
5 years agogitignore: add test_copy.ffmeta
Benoit Fouet [Fri, 17 Oct 2014 09:50:53 +0000 (11:50 +0200)]
gitignore: add test_copy.ffmeta

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
Michael Niedermayer [Fri, 17 Oct 2014 13:34:24 +0000 (15:34 +0200)]
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'

* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
  rtmpproto: Add getStreamLength call to query duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '324b23dde1bc8638959eb32419c95a93906db272'
Michael Niedermayer [Fri, 17 Oct 2014 13:21:26 +0000 (15:21 +0200)]
Merge commit '324b23dde1bc8638959eb32419c95a93906db272'

* commit '324b23dde1bc8638959eb32419c95a93906db272':
  rtmpproto: Add function to read a number response

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'
Michael Niedermayer [Fri, 17 Oct 2014 12:57:00 +0000 (14:57 +0200)]
Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
  cmdutils: Use the correct guard

Conflicts:
cmdutils.c

See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'
Michael Niedermayer [Fri, 17 Oct 2014 12:21:25 +0000 (14:21 +0200)]
Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

* commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee':
  avformat: Make avformat_free_context handle NULL

See: ee23dcf534801931c13f9f534586b56e231d3085
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
Michael Niedermayer [Fri, 17 Oct 2014 12:08:40 +0000 (14:08 +0200)]
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'

* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
  avconv: check return value

Conflicts:
ffmpeg.c

See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
Michael Niedermayer [Fri, 17 Oct 2014 11:47:49 +0000 (13:47 +0200)]
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
  avconv: fix leak in filter error

Conflicts:
ffmpeg_filter.c

See: 14369f59c5ad1fb817fb4d94073f31cccf12b556
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
Michael Niedermayer [Fri, 17 Oct 2014 11:35:27 +0000 (13:35 +0200)]
Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'

* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
  avprobe: Remove a pointless check

Conflicts:
avprobe.c

No change as the code does not exist in ffprobe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'
Michael Niedermayer [Fri, 17 Oct 2014 11:28:50 +0000 (13:28 +0200)]
Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
Michael Niedermayer [Fri, 17 Oct 2014 11:17:05 +0000 (13:17 +0200)]
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/fate/mpeg4: fix samples path
Michael Niedermayer [Fri, 17 Oct 2014 11:07:55 +0000 (13:07 +0200)]
tests/fate/mpeg4: fix samples path

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'
Michael Niedermayer [Fri, 17 Oct 2014 10:52:15 +0000 (12:52 +0200)]
Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'

* commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48':
  fate: add mpeg4 tests for frame size changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/m4vdec: mark as possibly containing discontinuities
Michael Niedermayer [Fri, 17 Oct 2014 10:37:40 +0000 (12:37 +0200)]
avformat/m4vdec: mark as possibly containing discontinuities

This will be needed for the resolution change mpeg4 test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmpproto: Add getStreamLength call to query duration
Uwe L. Korn [Tue, 14 Oct 2014 15:16:21 +0000 (17:16 +0200)]
rtmpproto: Add getStreamLength call to query duration

In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmpproto: Add function to read a number response
Uwe L. Korn [Tue, 14 Oct 2014 15:16:20 +0000 (17:16 +0200)]
rtmpproto: Add function to read a number response

Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agocmdutils: Use the correct guard
Luca Barbato [Wed, 15 Oct 2014 00:43:30 +0000 (02:43 +0200)]
cmdutils: Use the correct guard

The OptionDef arrays are terminated with a { NULL } element not NULL.

CC: libav-stable@libav.org
Bug-Id: CID 703769

5 years agoavformat: Make avformat_free_context handle NULL
Luca Barbato [Wed, 15 Oct 2014 00:35:55 +0000 (02:35 +0200)]
avformat: Make avformat_free_context handle NULL

Work as the other free()-like functions.

Bug-Id: CID 1087081
CC: libav-stable@libav.org
5 years agoavconv: check return value
Vittorio Giovara [Tue, 14 Oct 2014 15:46:48 +0000 (16:46 +0100)]
avconv: check return value

CC: libav-stable@libav.org
Bug-Id: CID 1224275

5 years agoavconv: fix leak in filter error
Vittorio Giovara [Tue, 14 Oct 2014 15:46:44 +0000 (16:46 +0100)]
avconv: fix leak in filter error

CC: libav-stable@libav.org
Bug-Id: CID 1005311

5 years agoavprobe: Remove a pointless check
Luca Barbato [Tue, 14 Oct 2014 15:46:42 +0000 (16:46 +0100)]
avprobe: Remove a pointless check

The element is always valid.

CC: libav-stable@libav.org
Bug-Id: CID 732276

5 years agoavplay: Always free opts
Luca Barbato [Tue, 14 Oct 2014 15:46:39 +0000 (16:46 +0100)]
avplay: Always free opts

CC: libav-stable@libav.org
Bug-Id: CID 733793

5 years agoavplay: Always free find_stream_info options
Luca Barbato [Tue, 14 Oct 2014 15:46:38 +0000 (16:46 +0100)]
avplay: Always free find_stream_info options

CC: libav-stable@libav.org
Bug-Id: CID 1238794

5 years agofate: add mpeg4 tests for frame size changes
Janne Grunau [Tue, 18 Sep 2012 14:03:08 +0000 (16:03 +0200)]
fate: add mpeg4 tests for frame size changes

5 years agodoc/filters.texi: fix several typos in the vidstab* sections
Moritz Barsnick [Wed, 15 Oct 2014 13:44:33 +0000 (15:44 +0200)]
doc/filters.texi: fix several typos in the vidstab* sections

Also create an anchor for the unsharp filter, and references to
it in its mentions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/vf_noise: move asm code to a separate file
James Almer [Fri, 17 Oct 2014 01:24:42 +0000 (22:24 -0300)]
x86/vf_noise: move asm code to a separate file

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoswresample/resample: fix invert_initial_buffer() after flush
Michael Niedermayer [Thu, 16 Oct 2014 19:18:15 +0000 (21:18 +0200)]
swresample/resample: fix invert_initial_buffer() after flush

Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample: do not put multiple statements in one line
Michael Niedermayer [Thu, 16 Oct 2014 16:18:40 +0000 (18:18 +0200)]
swresample: do not put multiple statements in one line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/id3v2: silence a warning when CONFIG_ZLIB is unset.
Benoit Fouet [Thu, 16 Oct 2014 09:44:46 +0000 (11:44 +0200)]
avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.

dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_noise: Use a separate seed for each plane
Michael Niedermayer [Thu, 16 Oct 2014 13:05:17 +0000 (15:05 +0200)]
avfilter/vf_noise: Use a separate seed for each plane

This should reduce the correlation between planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_noise: use per component rand_shift
Michael Niedermayer [Thu, 16 Oct 2014 12:51:04 +0000 (14:51 +0200)]
avfilter/vf_noise: use per component rand_shift

This allows using different shifts per plane

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_noise: move shift calculation to filter_frame()
Michael Niedermayer [Thu, 16 Oct 2014 12:28:47 +0000 (14:28 +0200)]
avfilter/vf_noise: move shift calculation to filter_frame()

This makes the temporal noise case deterministic with threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_noise: fix high resolution support
Michael Niedermayer [Thu, 16 Oct 2014 11:23:39 +0000 (13:23 +0200)]
avfilter/vf_noise: fix high resolution support

Fixes Ticket4017
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '979932378ae3fbf452e312eb759cc7ce175f78de'
Michael Niedermayer [Thu, 16 Oct 2014 10:38:59 +0000 (12:38 +0200)]
Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'

* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
  ismindex: use tfhd default duration if no sample duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'
Michael Niedermayer [Thu, 16 Oct 2014 10:28:00 +0000 (12:28 +0200)]
Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'

* commit '460b509a34fb5fad3bedac8429f53594d3923ea8':
  rtsp: Check a memory allocation

See: c69f230a3afbfa30d7a978a6961b1ddcc774499f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix initialisers in dct-test.c.
Carl Eugen Hoyos [Thu, 16 Oct 2014 10:01:26 +0000 (12:01 +0200)]
Fix initialisers in dct-test.c.

Silences a warning when running fate on unusual platforms:
libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]

5 years agoismindex: use tfhd default duration if no sample duration
Mika Raento [Thu, 16 Oct 2014 05:55:17 +0000 (08:55 +0300)]
ismindex: use tfhd default duration if no sample duration

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortsp: Check a memory allocation
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
rtsp: Check a memory allocation

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agompegts: add the judgement if a new program is created successfully
Di Wu [Wed, 15 Oct 2014 08:24:21 +0000 (16:24 +0800)]
mpegts: add the judgement if a new program is created successfully

Add the judement after create a new program to avoid segment fault.

Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
Michael Niedermayer [Wed, 15 Oct 2014 23:53:43 +0000 (01:53 +0200)]
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration(...
Michael Niedermayer [Wed, 15 Oct 2014 23:48:41 +0000 (01:48 +0200)]
avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case

No testcase where this makes a difference is known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsedirac: use AVCodecContext.framerate
Michael Niedermayer [Wed, 15 Oct 2014 22:29:14 +0000 (00:29 +0200)]
avformat/oggparsedirac: use AVCodecContext.framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avcodec: more verbose documentation for time_base
Michael Niedermayer [Wed, 15 Oct 2014 22:13:45 +0000 (00:13 +0200)]
avcodec/avcodec: more verbose documentation for time_base

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avcodec: fix non doxy comment
Michael Niedermayer [Wed, 15 Oct 2014 22:10:38 +0000 (00:10 +0200)]
avcodec/avcodec: fix non doxy comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'
Michael Niedermayer [Wed, 15 Oct 2014 22:02:50 +0000 (00:02 +0200)]
Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'

* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
  rtmpproto: Fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'
Michael Niedermayer [Wed, 15 Oct 2014 21:23:49 +0000 (23:23 +0200)]
Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'

* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
  rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
Michael Niedermayer [Wed, 15 Oct 2014 20:03:02 +0000 (22:03 +0200)]
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'

* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
  rtpdec_hevc: Rename a variable for clarity

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '74b02377980321934e33969c84733ace7e9f4eeb'
Michael Niedermayer [Wed, 15 Oct 2014 19:39:50 +0000 (21:39 +0200)]
Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'

* commit '74b02377980321934e33969c84733ace7e9f4eeb':
  mov: Correctly check the color transfer characteristics range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'
Michael Niedermayer [Wed, 15 Oct 2014 19:22:06 +0000 (21:22 +0200)]
Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'

* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
  imc: fix order of operations in coefficients read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: auodetect "use_mfra_for"
Michael Niedermayer [Mon, 13 Oct 2014 11:35:33 +0000 (13:35 +0200)]
avformat/mov: auodetect "use_mfra_for"

Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobuild: mov_muxer requires ac3_parser
Yu Xiaolei [Wed, 15 Oct 2014 05:33:39 +0000 (13:33 +0800)]
build: mov_muxer requires ac3_parser

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtsp: check memory allocation
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
avformat/rtsp: check memory allocation

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmpproto: Fix a typo
Martin Storsjö [Wed, 15 Oct 2014 10:41:33 +0000 (13:41 +0300)]
rtmpproto: Fix a typo

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Martin Storsjö [Wed, 15 Oct 2014 13:21:27 +0000 (16:21 +0300)]
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpdec_hevc: Rename a variable for clarity
Martin Storsjö [Wed, 15 Oct 2014 13:14:28 +0000 (16:14 +0300)]
rtpdec_hevc: Rename a variable for clarity

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc/encoders: add basic libx265 documentation
Lou Logan [Thu, 2 Oct 2014 23:05:08 +0000 (15:05 -0800)]
doc/encoders: add basic libx265 documentation

Fixes ticket #3944.

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agoavcodec/ass: add FFmpeg signature
Clément Bœsch [Sat, 11 Oct 2014 16:37:43 +0000 (18:37 +0200)]
avcodec/ass: add FFmpeg signature

5 years agoavformat/assdec: typo fix
Clément Bœsch [Sat, 11 Oct 2014 18:14:37 +0000 (20:14 +0200)]
avformat/assdec: typo fix

5 years agoavcodec/ass_split: realign after addition of new fields
Clément Bœsch [Sat, 11 Oct 2014 18:16:43 +0000 (20:16 +0200)]
avcodec/ass_split: realign after addition of new fields

5 years agoavcodec/ass_split: assume default order when "Format:" line is not found
Clément Bœsch [Sat, 11 Oct 2014 14:12:51 +0000 (16:12 +0200)]
avcodec/ass_split: assume default order when "Format:" line is not found

Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.

5 years agoavcodec/ass_split: extend recognized fields in ASS splitter
Clément Bœsch [Sat, 11 Oct 2014 14:10:51 +0000 (16:10 +0200)]
avcodec/ass_split: extend recognized fields in ASS splitter

This simplifies the logic for the fix in the next commit.

5 years agoavcodec/ass: output missing fields in AVSubtitles and output files
Clément Bœsch [Sat, 11 Oct 2014 12:31:23 +0000 (14:31 +0200)]
avcodec/ass: output missing fields in AVSubtitles and output files

Fixes Ticket #3207

5 years agoavformat/assenc: support remuxing old V4 ASS form (SSA)
Clément Bœsch [Sat, 11 Oct 2014 10:57:37 +0000 (12:57 +0200)]
avformat/assenc: support remuxing old V4 ASS form (SSA)

5 years agofate: fix some subtitles tests dependencies
Clément Bœsch [Sat, 11 Oct 2014 12:05:49 +0000 (14:05 +0200)]
fate: fix some subtitles tests dependencies

5 years agofate: add rawdiff and use it for subtitles
Clément Bœsch [Sat, 11 Oct 2014 17:17:33 +0000 (19:17 +0200)]
fate: add rawdiff and use it for subtitles

We want subtitles tests to match exactly line endings and trailing
characters.

5 years agofate: make subtitles tests output to stdout instead of md5
Clément Bœsch [Sat, 11 Oct 2014 11:55:55 +0000 (13:55 +0200)]
fate: make subtitles tests output to stdout instead of md5

This makes tracking subtitles changes simpler.

5 years agodoc/filters: update link to OpenCV docs
Lou Logan [Tue, 14 Oct 2014 00:41:00 +0000 (16:41 -0800)]
doc/filters: update link to OpenCV docs

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agoMerge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5'
Michael Niedermayer [Wed, 15 Oct 2014 17:11:45 +0000 (19:11 +0200)]
Merge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5'

* commit 'e5cfc8fdad901c9487fe896421972852f38bcf5':
  sdp: Provide out of bound parameter sets for HEVC if extradata is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'
Michael Niedermayer [Wed, 15 Oct 2014 17:04:17 +0000 (19:04 +0200)]
Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'

* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780':
  rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'
Michael Niedermayer [Wed, 15 Oct 2014 16:47:44 +0000 (18:47 +0200)]
Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'

* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_fra...
Michael Niedermayer [Wed, 15 Oct 2014 16:23:21 +0000 (18:23 +0200)]
avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
Michael Niedermayer [Wed, 15 Oct 2014 14:24:43 +0000 (16:24 +0200)]
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'

* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
  lavf: switch to AVCodecContext.framerate for demuxing

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dpx: fix framerate
Michael Niedermayer [Wed, 15 Oct 2014 13:57:15 +0000 (15:57 +0200)]
avcodec/dpx: fix framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1: fix time_base and framerate
Michael Niedermayer [Wed, 15 Oct 2014 13:54:02 +0000 (15:54 +0200)]
avcodec/vc1: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: fix time_base and framerate
Michael Niedermayer [Wed, 15 Oct 2014 13:54:02 +0000 (15:54 +0200)]
avcodec/h264: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg12dec: fix time_base and framerate
Michael Niedermayer [Wed, 15 Oct 2014 13:54:02 +0000 (15:54 +0200)]
avcodec/mpeg12dec: fix time_base and framerate

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: fix time_base after the framerate addition
Michael Niedermayer [Wed, 15 Oct 2014 13:50:49 +0000 (15:50 +0200)]
avcodec/utils: fix time_base after the framerate addition

time_base != 1/framerate for example for interlaced video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'
Michael Niedermayer [Wed, 15 Oct 2014 11:38:10 +0000 (13:38 +0200)]
Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'

* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
  lavc: deprecate the use of AVCodecContext.time_base for decoding

Conflicts:
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo_parser.c
libavcodec/utils.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: Correctly check the color transfer characteristics range
Vittorio Giovara [Mon, 13 Oct 2014 12:34:24 +0000 (13:34 +0100)]
mov: Correctly check the color transfer characteristics range

Reported-by: Ruoyu <liangry@ucweb.com>
5 years agoimc: fix order of operations in coefficients read
Vittorio Giovara [Mon, 13 Oct 2014 14:42:28 +0000 (15:42 +0100)]
imc: fix order of operations in coefficients read

Reported-by: Ruoyu <liangry@ucweb.com>
5 years agoMerge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'
Michael Niedermayer [Wed, 15 Oct 2014 10:30:07 +0000 (12:30 +0200)]
Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'

* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109':
  vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'
Michael Niedermayer [Wed, 15 Oct 2014 10:17:15 +0000 (12:17 +0200)]
Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

* commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193':
  vdpau: have av_vdpau_bind_context() fail on unsupported flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a'
Michael Niedermayer [Wed, 15 Oct 2014 10:08:09 +0000 (12:08 +0200)]
Merge commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a'

* commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a':
  doc: fix typing mistake

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosdp: Provide out of bound parameter sets for HEVC if extradata is set
Martin Storsjö [Fri, 3 Oct 2014 20:25:37 +0000 (23:25 +0300)]
sdp: Provide out of bound parameter sets for HEVC if extradata is set

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
Martin Storsjö [Fri, 3 Oct 2014 18:40:13 +0000 (21:40 +0300)]
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines

These are assembled into extradata in the order vps/sps/pps/sei.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavconv: replace AVCodecContext.time_base with framerate
Anton Khirnov [Fri, 4 Apr 2014 11:06:22 +0000 (13:06 +0200)]
avconv: replace AVCodecContext.time_base with framerate

5 years agolavf: switch to AVCodecContext.framerate for demuxing
Anton Khirnov [Wed, 8 Oct 2014 19:23:14 +0000 (19:23 +0000)]
lavf: switch to AVCodecContext.framerate for demuxing

5 years agolavc: deprecate the use of AVCodecContext.time_base for decoding
Anton Khirnov [Fri, 4 Apr 2014 10:47:44 +0000 (12:47 +0200)]
lavc: deprecate the use of AVCodecContext.time_base for decoding

When decoding, this field holds the inverse of the framerate that can be
written in the headers for some codecs. Using a field called 'time_base'
for this is very misleading, as there are no timestamps associated with
it. Furthermore, this field is used for a very different purpose during
encoding.

Add a new field, called 'framerate', to replace the use of time_base for
decoding.

5 years agovdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check
Rémi Denis-Courmont [Tue, 14 Oct 2014 09:59:54 +0000 (12:59 +0300)]
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

Decoding acceleration may work even if the codec level is higher than
the stated limit of the VDPAU driver. Or the problem may be considered
acceptable by the user. This flag allows skipping the codec level
capability checks and proceed with decoding.

Applications should obviously not set this flag by default, but only if
the user explicitly requested this behavior (and presumably knows how
to turn it back off if it fails).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agovdpau: have av_vdpau_bind_context() fail on unsupported flag
Rémi Denis-Courmont [Tue, 14 Oct 2014 09:59:53 +0000 (12:59 +0300)]
vdpau: have av_vdpau_bind_context() fail on unsupported flag

Currently, no flags are supported.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agodoc: fix typing mistake
Rémi Denis-Courmont [Tue, 14 Oct 2014 09:59:52 +0000 (12:59 +0300)]
doc: fix typing mistake

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/mxfdec: cleanup if parsing the header metadata fails
Michael Niedermayer [Wed, 15 Oct 2014 00:20:58 +0000 (02:20 +0200)]
avformat/mxfdec: cleanup if parsing the header metadata fails

Fixes memleaks
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: Fix memleak of packages_refs
Michael Niedermayer [Wed, 15 Oct 2014 00:16:18 +0000 (02:16 +0200)]
avformat/mxfdec: Fix memleak of packages_refs

Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: Fix memleak of primer_packs
Michael Niedermayer [Wed, 15 Oct 2014 00:16:18 +0000 (02:16 +0200)]
avformat/mxfdec: Fix memleak of primer_packs

Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: Fix termination of mxf_data_essence_container_uls
Michael Niedermayer [Tue, 14 Oct 2014 23:36:04 +0000 (01:36 +0200)]
avformat/mxfdec: Fix termination of mxf_data_essence_container_uls

Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a'
Michael Niedermayer [Tue, 14 Oct 2014 20:23:01 +0000 (22:23 +0200)]
Merge commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a'

* commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a':
  mov: Handle tfdt atoms

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea'
Michael Niedermayer [Tue, 14 Oct 2014 19:51:33 +0000 (21:51 +0200)]
Merge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea'

* commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea':
  movenc: Write tfdt atoms

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer
Michael Niedermayer [Tue, 14 Oct 2014 16:52:51 +0000 (18:52 +0200)]
avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as...
Michael Niedermayer [Tue, 14 Oct 2014 16:30:52 +0000 (18:30 +0200)]
avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 14 Oct 2014 16:30:15 +0000 (18:30 +0200)]
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 14 Oct 2014 16:29:49 +0000 (18:29 +0200)]
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory

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