ffmpeg.git
5 years agoavutil/xtea: add Doxy @file and group
Timothy Gu [Sat, 2 Nov 2013 22:03:30 +0000 (15:03 -0700)]
avutil/xtea: add Doxy @file and group

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/adler32: add Doxy group
Timothy Gu [Sat, 2 Nov 2013 22:03:15 +0000 (15:03 -0700)]
avutil/adler32: add Doxy group

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibvpxenc: add VP9 options
James Zern [Sat, 2 Nov 2013 23:20:19 +0000 (00:20 +0100)]
libvpxenc: add VP9 options

same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add myself for libvpx*
James Zern [Sat, 2 Nov 2013 23:28:18 +0000 (00:28 +0100)]
MAINTAINERS: add myself for libvpx*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffv1enc: store 2pass statistics at the end
Michael Niedermayer [Sat, 2 Nov 2013 21:27:32 +0000 (22:27 +0100)]
ffv1enc: store 2pass statistics at the end

This reduces their size from O(n) to O(1)

Fixes Ticket3078

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1enc: pass through pts
Michael Niedermayer [Sat, 2 Nov 2013 21:52:19 +0000 (22:52 +0100)]
avcodec/ffv1enc: pass through pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibvpxenc: split vp8/vp9 options array
James Zern [Sat, 2 Nov 2013 19:09:01 +0000 (20:09 +0100)]
libvpxenc: split vp8/vp9 options array

the current options are left for both to provide command line compatibility

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libmp3lame: add ABR support
Timothy Gu [Sat, 2 Nov 2013 02:43:24 +0000 (19:43 -0700)]
avcodec/libmp3lame: add ABR support

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 2 Nov 2013 17:37:14 +0000 (18:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  os_support: Add #endif comments for better readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'
Michael Niedermayer [Sat, 2 Nov 2013 17:31:41 +0000 (18:31 +0100)]
Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'

* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381e1e7790f21...
Michael Niedermayer [Sat, 2 Nov 2013 14:47:48 +0000 (15:47 +0100)]
avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea0...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea0...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381e1e7790f21b0199a...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381e1e7790f21b...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevc: indention related cosmetics to reduce diff to 064698d381e1e7790f21b0...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: indention related cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381e1e7790f21b0199a89...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/hevc: reduce whitespace differences to 064698d381e1e7790f21b0199a8930ea04e...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: reduce whitespace differences to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoos_support: Add #endif comments for better readability
Diego Biurrun [Sat, 2 Nov 2013 11:00:42 +0000 (12:00 +0100)]
os_support: Add #endif comments for better readability

5 years agolibavcodec/hevc: reduce bracket differences to 064698d381e1e7790f21b0199a8930ea04e2e942
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: reduce bracket differences to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: more whitespaces to reduce difference to 064698d381e1e7790f21b0199a8930...
Michael Niedermayer [Sat, 2 Nov 2013 10:43:43 +0000 (11:43 +0100)]
avcodec/hevc: more whitespaces to reduce difference to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg4video_parser: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:31:10 +0000 (18:31 +0100)]
mpeg4video_parser: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 2 Nov 2013 09:37:03 +0000 (10:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
Michael Niedermayer [Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)]
Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'

* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '037fea388e0df2a22441bc1ed86794152161baf1'
Michael Niedermayer [Sat, 2 Nov 2013 09:19:12 +0000 (10:19 +0100)]
Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'

* commit '037fea388e0df2a22441bc1ed86794152161baf1':
  flashsv: K&R formatting cosmetics

Conflicts:
libavcodec/flashsv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1700b4e678ed329611a16b20d11e64b7abda4839'
Michael Niedermayer [Sat, 2 Nov 2013 09:11:35 +0000 (10:11 +0100)]
Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'

* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
  x86: vp8dsp: Split loopfilter code into a separate file

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'
Michael Niedermayer [Sat, 2 Nov 2013 09:02:12 +0000 (10:02 +0100)]
Merge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'

* commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f':
  configure: Properly check for availability of -Wno-foo warning flags

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '23157d72b565e0228fec97f1eb059d4f8021a260'
Michael Niedermayer [Sat, 2 Nov 2013 08:55:40 +0000 (09:55 +0100)]
Merge commit '23157d72b565e0228fec97f1eb059d4f8021a260'

* commit '23157d72b565e0228fec97f1eb059d4f8021a260':
  configure: Split test_cflags function off from check_cflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd an HDS live fragmenting muxer
Martin Storsjö [Thu, 15 Aug 2013 13:06:52 +0000 (16:06 +0300)]
Add an HDS live fragmenting muxer

HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
Michael Niedermayer [Sat, 2 Nov 2013 08:48:34 +0000 (09:48 +0100)]
Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'

* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
  lavf: do not use int to store an int64

Conflicts:
libavformat/utils.c

See: ad56535dd1d7204ea0958decac15e8dfc86162ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
Michael Niedermayer [Sat, 2 Nov 2013 08:39:51 +0000 (09:39 +0100)]
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'

* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
  flashsv: Check diff_start diff_height values

Conflicts:
libavcodec/flashsv.c

See: 880c73cd76109697447fbfbaa8e5ee5683309446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4a64e67988dd01005efb1ae831bff14c1656b573'
Michael Niedermayer [Sat, 2 Nov 2013 08:31:50 +0000 (09:31 +0100)]
Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573'

* commit '4a64e67988dd01005efb1ae831bff14c1656b573':
  flashsv: Refactor a little

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_refs: use named constant for setting frame_recovered
Michael Niedermayer [Sat, 2 Nov 2013 01:37:29 +0000 (02:37 +0100)]
h264_refs: use named constant for setting frame_recovered

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: factor "if(h->sei_recovery_frame_cnt >= 0)" out
Michael Niedermayer [Sat, 2 Nov 2013 00:02:21 +0000 (01:02 +0100)]
h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: Adjust white-spaces to reduce difference to 064698d381e1e7790f21b0199a8...
Michael Niedermayer [Fri, 1 Nov 2013 23:31:49 +0000 (00:31 +0100)]
avcodec/hevc: Adjust white-spaces to reduce difference to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8)
Mickaël Raulet [Thu, 31 Oct 2013 22:51:08 +0000 (23:51 +0100)]
hevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg4video: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:31:07 +0000 (18:31 +0100)]
mpeg4video: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoflashsv: K&R formatting cosmetics
Luca Barbato [Thu, 31 Oct 2013 09:27:02 +0000 (10:27 +0100)]
flashsv: K&R formatting cosmetics

Also improve some log message wording/spelling.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agox86: vp8dsp: Split loopfilter code into a separate file
Diego Biurrun [Tue, 29 Oct 2013 13:45:48 +0000 (14:45 +0100)]
x86: vp8dsp: Split loopfilter code into a separate file

5 years agoconfigure: Properly check for availability of -Wno-foo warning flags
Diego Biurrun [Thu, 31 Oct 2013 19:14:37 +0000 (20:14 +0100)]
configure: Properly check for availability of -Wno-foo warning flags

For some weird reason gcc does not check if the -Wno disabling variants
of warning flags match existing warning flags. Instead it swallows them
silently. That is, unless other warning or error messages are generated,
because then - for some even more bizarre reason - a complaint about the
unknown disable warning flag is issued along with the error or warning
message.

Thus to check for the availability of a warning disabling option, one
needs to check for the enabling variant instead and then add the
disabling variant to CFLAGS.

5 years agoconfigure: Split test_cflags function off from check_cflags
Diego Biurrun [Thu, 31 Oct 2013 18:48:59 +0000 (19:48 +0100)]
configure: Split test_cflags function off from check_cflags

This is useful to test flags without directly adding them to CFLAGS.

5 years agolavf: do not use int to store an int64
Anton Khirnov [Thu, 31 Oct 2013 21:40:33 +0000 (22:40 +0100)]
lavf: do not use int to store an int64

5 years agoavcodec/mvcdec: stop using deprecated avcodec_set_dimensions()
Paul B Mahol [Fri, 1 Nov 2013 19:03:32 +0000 (19:03 +0000)]
avcodec/mvcdec: stop using deprecated avcodec_set_dimensions()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/exr: stop using deprecated avcodec_set_dimensions()
Paul B Mahol [Fri, 1 Nov 2013 15:29:20 +0000 (15:29 +0000)]
avcodec/exr: stop using deprecated avcodec_set_dimensions()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/sanm: stop using deprecated avcodec_set_dimensions()
Paul B Mahol [Fri, 1 Nov 2013 15:26:38 +0000 (15:26 +0000)]
avcodec/sanm: stop using deprecated avcodec_set_dimensions()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()
Michael Niedermayer [Thu, 31 Oct 2013 22:29:01 +0000 (23:29 +0100)]
avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()

Fixes Ticket3103

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/isom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
avformat/isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 1 Nov 2013 18:40:08 +0000 (19:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtspenc: Make sure BYE packets are sent before TEARDOWN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflashsv: Check diff_start diff_height values
Michael Niedermayer [Tue, 20 Aug 2013 21:18:48 +0000 (23:18 +0200)]
flashsv: Check diff_start diff_height values

Fix out of array accesses.

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflashsv: Refactor a little
Luca Barbato [Tue, 29 Oct 2013 16:02:42 +0000 (17:02 +0100)]
flashsv: Refactor a little

5 years agoMerge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
Michael Niedermayer [Fri, 1 Nov 2013 18:34:19 +0000 (19:34 +0100)]
Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'

* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
  rtpenc: Add a rtpflag option for sending BYE packets when finishing

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b264453de93999ea6f23e98014390af468f56146'
Michael Niedermayer [Fri, 1 Nov 2013 18:33:03 +0000 (19:33 +0100)]
Merge commit 'b264453de93999ea6f23e98014390af468f56146'

* commit 'b264453de93999ea6f23e98014390af468f56146':
  rtpenc: Remove some superfluous parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'
Michael Niedermayer [Fri, 1 Nov 2013 18:28:14 +0000 (19:28 +0100)]
Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'

* commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4':
  aviobuf: Handle a NULL buffer in avio_close_dyn_buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '28240a60c1b5ce276e947ba013271ec009adc078'
Michael Niedermayer [Fri, 1 Nov 2013 18:19:58 +0000 (19:19 +0100)]
Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

* commit '28240a60c1b5ce276e947ba013271ec009adc078':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'
Michael Niedermayer [Fri, 1 Nov 2013 18:11:52 +0000 (19:11 +0100)]
Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'

* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0300962b76644f145b773439989a5cdf1667e162'
Michael Niedermayer [Fri, 1 Nov 2013 18:03:04 +0000 (19:03 +0100)]
Merge commit '0300962b76644f145b773439989a5cdf1667e162'

* commit '0300962b76644f145b773439989a5cdf1667e162':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used...
Michael Niedermayer [Fri, 1 Nov 2013 17:53:01 +0000 (18:53 +0100)]
avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions

This preempts ABI issues if their values get reused by the fork for something unrelated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'
Michael Niedermayer [Fri, 1 Nov 2013 17:47:47 +0000 (18:47 +0100)]
Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'

* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump
Michael Niedermayer [Fri, 1 Nov 2013 17:38:51 +0000 (18:38 +0100)]
avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump

This maintains ABI compatibility
also add a note that debug_mv must be accessed through AVOptions (for ABI)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
Michael Niedermayer [Fri, 1 Nov 2013 17:36:03 +0000 (18:36 +0100)]
Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'

* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
  lavc: deprecate AVCodecContext.debug_mv

Conflicts:
libavcodec/options_table.h

Not merged, debug_mv works fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'
Michael Niedermayer [Fri, 1 Nov 2013 17:31:12 +0000 (18:31 +0100)]
Merge commit 'fae753af709537fc75ff1c4ce21fc1f4429af929'

* commit 'fae753af709537fc75ff1c4ce21fc1f4429af929':
  avplay: drop -vismv option which does not do anything anymore

Conflicts:
Changelog
ffplay.c

Not merged, the vismv option works fine in ffplay

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'
Michael Niedermayer [Fri, 1 Nov 2013 17:13:05 +0000 (18:13 +0100)]
Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'

* commit 'ccc71298456d97f64f539e303c771d04dcb33c53':
  lavc: deprecate FF_DEBUG_MV and remove all traces of its use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
Michael Niedermayer [Fri, 1 Nov 2013 17:04:44 +0000 (18:04 +0100)]
Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'

* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
Changelog
libavformat/version.h

See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
Michael Niedermayer [Fri, 1 Nov 2013 16:57:57 +0000 (17:57 +0100)]
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
  matroskadec: Support HEVC demuxing

Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h

See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'
Michael Niedermayer [Fri, 1 Nov 2013 16:41:01 +0000 (17:41 +0100)]
Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'

* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
  mov: Support HEVC demuxing

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

See: 53f903b7c5427cb18659f7775714e860c1c5fc39
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5846646296e377e093441dfe9eadde38ff1f7c99'
Michael Niedermayer [Fri, 1 Nov 2013 16:31:18 +0000 (17:31 +0100)]
Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

Conflicts:
Changelog
libavformat/hevcdec.c
libavformat/version.h

See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc'
Michael Niedermayer [Fri, 1 Nov 2013 16:20:50 +0000 (17:20 +0100)]
Merge commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc'

* commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc':
  FATE: Add HEVC tests

Conflicts:
tests/fate/hevc.mak
tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
tests/ref/fate/hevc-conformance-POC_A_Bossen_3
tests/ref/fate/hevc-conformance-RPS_D_ericsson_5
tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3

See: fb3cea4be339f4544ca37fb0bc917d734d063a1f and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
Michael Niedermayer [Fri, 1 Nov 2013 15:14:39 +0000 (16:14 +0100)]
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'

* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
  Add HEVC decoder

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: free graphics context
Lukasz Marek [Fri, 1 Nov 2013 12:20:15 +0000 (13:20 +0100)]
lavd/xv: free graphics context

Valgrind detects mem leak from XCreateGC.
Free it with XFreeGC.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoMerge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'
Michael Niedermayer [Fri, 1 Nov 2013 14:55:55 +0000 (15:55 +0100)]
Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'

* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
  webp: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'
Michael Niedermayer [Fri, 1 Nov 2013 14:49:58 +0000 (15:49 +0100)]
Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'

* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/txd.c
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'
Michael Niedermayer [Fri, 1 Nov 2013 14:43:29 +0000 (15:43 +0100)]
Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'

* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/sunrast.c
libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'
Michael Niedermayer [Fri, 1 Nov 2013 14:34:49 +0000 (15:34 +0100)]
Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'

* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'
Michael Niedermayer [Fri, 1 Nov 2013 14:25:09 +0000 (15:25 +0100)]
Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'

* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
Michael Niedermayer [Fri, 1 Nov 2013 14:14:52 +0000 (15:14 +0100)]
Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'

* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'
Michael Niedermayer [Fri, 1 Nov 2013 14:07:25 +0000 (15:07 +0100)]
Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'

* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
Michael Niedermayer [Fri, 1 Nov 2013 13:50:02 +0000 (14:50 +0100)]
Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'

* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/gifdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_gradfun: add emms_c() for mmxext
Michael Niedermayer [Fri, 1 Nov 2013 13:41:07 +0000 (14:41 +0100)]
avfilter/vf_gradfun: add emms_c() for mmxext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"
Clément Bœsch [Fri, 1 Nov 2013 13:28:08 +0000 (14:28 +0100)]
Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"

This reverts commit fc5fe4804fd2ee9a29de502e9431b12d027c0c89, reversing
changes made to ffe33500983983946048def3a6047920d97d957b.

The factoring is broken; it's not calling the ssse3 code anymore, and
calling the mmx2 code with bad alignment. It also broke some FATE
instances.

Conflicts:
libavfilter/x86/vf_gradfun_init.c

5 years agoavfilter/x86/vf_gradfun_init: fix some consts & related warnings
Michael Niedermayer [Fri, 1 Nov 2013 13:20:10 +0000 (14:20 +0100)]
avfilter/x86/vf_gradfun_init: fix some consts & related warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'
Michael Niedermayer [Fri, 1 Nov 2013 13:09:17 +0000 (14:09 +0100)]
Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'

* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd6da372984c87fd6288c148c291065d6032ceda3'
Michael Niedermayer [Fri, 1 Nov 2013 13:01:02 +0000 (14:01 +0100)]
Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'

* commit 'd6da372984c87fd6288c148c291065d6032ceda3':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/eacmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c7a5acabc537c2ce363165c31250aba341b1a990'
Michael Niedermayer [Fri, 1 Nov 2013 12:40:01 +0000 (13:40 +0100)]
Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990'

* commit 'c7a5acabc537c2ce363165c31250aba341b1a990':
  dnxhddec: stop using deprecated avcodec_set_dimensions
  dirac: stop using deprecated avcodec_set_dimensions
  cdxl: stop using deprecated avcodec_set_dimensions
  avs: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'
Michael Niedermayer [Fri, 1 Nov 2013 12:28:33 +0000 (13:28 +0100)]
Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'

* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
  ansi: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ansi.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'
Michael Niedermayer [Fri, 1 Nov 2013 12:21:14 +0000 (13:21 +0100)]
Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'

* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
  lavc/utils: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce6949d3a0607eb318dc2872553110df934e9720'
Michael Niedermayer [Fri, 1 Nov 2013 12:15:13 +0000 (13:15 +0100)]
Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'

* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
  oggparsetheora: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7644f5a80787c9b608b82873604805d7e38a6a18'
Michael Niedermayer [Fri, 1 Nov 2013 12:07:15 +0000 (13:07 +0100)]
Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'

* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: simplify frame_recovered code
Michael Niedermayer [Fri, 1 Nov 2013 11:51:33 +0000 (12:51 +0100)]
h264: simplify frame_recovered code

This is a separate commit to ease future bisecting in case it breaks something.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '28096e0a806e57376541e6222d315619906e3c55'
Michael Niedermayer [Fri, 1 Nov 2013 10:33:36 +0000 (11:33 +0100)]
Merge commit '28096e0a806e57376541e6222d315619906e3c55'

* commit '28096e0a806e57376541e6222d315619906e3c55':
  h264: wait for initial complete frame before outputing frames

Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/mpegvideo.h
libavutil/frame.h
libavutil/version.h

See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: add libfaac encoder documentation
Stefano Sabatini [Wed, 30 Oct 2013 13:25:29 +0000 (14:25 +0100)]
doc/encoders: add libfaac encoder documentation

5 years agodoc/encoders: document the libfdk-aac wrapper
Stefano Sabatini [Tue, 29 Oct 2013 20:50:09 +0000 (21:50 +0100)]
doc/encoders: document the libfdk-aac wrapper

Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.

5 years agodoc/encoders: extend/clarify libtheora encoder documentation
Stefano Sabatini [Wed, 30 Oct 2013 14:10:04 +0000 (15:10 +0100)]
doc/encoders: extend/clarify libtheora encoder documentation

5 years agoMerge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
Michael Niedermayer [Fri, 1 Nov 2013 09:39:50 +0000 (10:39 +0100)]
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
Michael Niedermayer [Fri, 1 Nov 2013 09:26:49 +0000 (10:26 +0100)]
Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'

* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ee80cf741a44115758e62399b7bde08d33161151'
Michael Niedermayer [Fri, 1 Nov 2013 09:20:20 +0000 (10:20 +0100)]
Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'

* commit 'ee80cf741a44115758e62399b7bde08d33161151':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortspenc: Make sure BYE packets are sent before TEARDOWN
Martin Storsjö [Wed, 30 Oct 2013 17:12:45 +0000 (19:12 +0200)]
rtspenc: Make sure BYE packets are sent before TEARDOWN

Also make sure the BYE packets are sent at all when using
TCP interleaved transport.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpenc: Add a rtpflag option for sending BYE packets when finishing
Martin Storsjö [Wed, 30 Oct 2013 17:12:27 +0000 (19:12 +0200)]
rtpenc: Add a rtpflag option for sending BYE packets when finishing

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpenc: Remove some superfluous parentheses
Martin Storsjö [Wed, 30 Oct 2013 17:11:29 +0000 (19:11 +0200)]
rtpenc: Remove some superfluous parentheses

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoaviobuf: Handle a NULL buffer in avio_close_dyn_buf
Martin Storsjö [Wed, 30 Oct 2013 17:09:30 +0000 (19:09 +0200)]
aviobuf: Handle a NULL buffer in avio_close_dyn_buf

This simplifies proper error handling in rtsp.c/rtspdec.c. When
broadcasting over RTSP in TCP mode, the AVIOContext is closed and
recreated for each sent packet, and if the recreation fails, we might
try to close a NULL buffer when freeing things at the end.

Previously, if recreating the buffer in rtspdec.c failed, this would
crash later due to trying to close a NULL buffer.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/wmv2enc: Collect statistics for 2 pass encoding
Michael Niedermayer [Thu, 31 Oct 2013 23:40:33 +0000 (00:40 +0100)]
avcodec/wmv2enc: Collect statistics for 2 pass encoding

Fixes Ticket3053

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