ffmpeg.git
4 years agolavf: add samba protocol via libsmbclient
Lukasz Marek [Sat, 12 Jul 2014 22:54:23 +0000 (00:54 +0200)]
lavf: add samba protocol via libsmbclient

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: Add ubitux for text subtitles
Michael Niedermayer [Sun, 13 Jul 2014 17:29:23 +0000 (19:29 +0200)]
MAINTAINERS: Add ubitux for text subtitles

ubitux maintains them. It seems it was forgotten to update MAINTAINERs though

See: Re: [FFmpeg-devel] [PATCH] MAINTAINERS: add Subtitle maintainer
     Message-ID: <20140713120546.GC26262@leki>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAVFormat: LRC demuxer and muxer
Star Brilliant [Wed, 9 Jul 2014 06:24:05 +0000 (14:24 +0800)]
AVFormat: LRC demuxer and muxer

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoarmv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)
Ben Avison [Thu, 10 Jul 2014 23:14:28 +0000 (00:14 +0100)]
armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)

The previous implementation targeted DTS Coherent Acoustics, which only
requires mdct_bits == 6. This relatively small size lent itself to
unrolling the loops a small number of times, and encoding offsets
calculated at assembly time within the load/store instructions of each
iteration.

In the more general case (codecs such as AAC and AC3) much larger arrays
are used - mdct_bits == [8, 9, 11]. The old method does not scale for
these cases, so more integer registers are used with non-unrolled versions
of the loops (and with some stack spillage). The postrotation filter loop
is still unrolled by a factor of 2 to permit the double-buffering of some
VFP registers to facilitate overlap of neighbouring iterations.

I benchmarked the result by measuring the number of gperftools samples
that hit anywhere in the AAC decoder (starting from aac_decode_frame())
or specifically in ff_imdct_half_c / ff_imdct_half_vfp, for the same
example AAC stream:

                  Before          After
                  Mean   StdDev   Mean   StdDev  Confidence  Change
aac_decode_frame  2368.1 35.8     2117.2 35.3    100.0%      +11.8%
ff_imdct_half_*   457.5  22.4     251.2  16.2    100.0%      +82.1%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2
James Almer [Sun, 13 Jul 2014 06:00:50 +0000 (03:00 -0300)]
x86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: fix direct temporal mvs for bottom-field-first poc order.
Ronald S. Bultje [Sat, 12 Jul 2014 22:38:13 +0000 (18:38 -0400)]
h264: fix direct temporal mvs for bottom-field-first poc order.

Fixes http://forum.doom9.org/showthread.php?t=170867.
Fixes: corrupt-1677.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/x86/rgb2rgb_template: fix 1 byte overread in yuyvtoyuv420 and uyvytoyuv420
Michael Niedermayer [Sun, 13 Jul 2014 03:24:50 +0000 (05:24 +0200)]
swscale/x86/rgb2rgb_template: fix 1 byte overread in yuyvtoyuv420 and uyvytoyuv420

might fix ticket 3410

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec: dvrms timestamps are pts not dts
Michael Niedermayer [Sun, 13 Jul 2014 01:23:54 +0000 (03:23 +0200)]
avformat/asfdec: dvrms timestamps are pts not dts

Should fix Ticket3328

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: do not wait for packets from discarded streams for genpts
Michael Niedermayer [Sat, 12 Jul 2014 23:07:59 +0000 (01:07 +0200)]
avformat/utils: do not wait for packets from discarded streams for genpts

Fixes long loop
Fixes Ticket3208

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: fix alphabetical order of previous commit
Michael Niedermayer [Sat, 12 Jul 2014 21:24:16 +0000 (23:24 +0200)]
configure: fix alphabetical order of previous commit

Was requested in review

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd -Wformat and -Werror=format-security compiler flags
Andreas Cadhalpun [Sat, 12 Jul 2014 20:11:56 +0000 (22:11 +0200)]
Add -Wformat and -Werror=format-security compiler flags

These are part of the hardening flags used by Debian.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofix spelling errors
Andreas Cadhalpun [Sat, 12 Jul 2014 20:10:53 +0000 (22:10 +0200)]
fix spelling errors

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: dont clear programs during probing
Michael Niedermayer [Sat, 12 Jul 2014 19:49:15 +0000 (21:49 +0200)]
avformat/mpegts: dont clear programs during probing

Fixes Ticket 3763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: more clearing to avoid stale pointers
Michael Niedermayer [Sat, 12 Jul 2014 04:50:21 +0000 (06:50 +0200)]
avcodec/hevc: more clearing to avoid stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: do not loose all reference to pointers still in use
Michael Niedermayer [Sat, 12 Jul 2014 04:36:25 +0000 (06:36 +0200)]
avcodec/hevc_ps: do not loose all reference to pointers still in use

Fixes leaving a pointer to unreferenced memory
Fixes Ticket 3115

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/libswresample.v: hide ff_*
Michael Niedermayer [Sat, 12 Jul 2014 16:39:46 +0000 (18:39 +0200)]
swresample/libswresample.v: hide ff_*

Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/encoders: Document "dvdsub workaround for some players"
Oliver Fromme [Thu, 10 Jul 2014 17:41:08 +0000 (19:41 +0200)]
doc/encoders: Document "dvdsub workaround for some players"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffplay: increase subtitle que size
Michael Niedermayer [Fri, 11 Jul 2014 22:44:41 +0000 (00:44 +0200)]
ffplay: increase subtitle que size

Fixes part of Ticket2516 with ffplay

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/dsputilenc: remove some empty if statements
James Almer [Sat, 12 Jul 2014 01:08:49 +0000 (22:08 -0300)]
x86/dsputilenc: remove some empty if statements

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: Check layer_id_included_flags count
Michael Niedermayer [Sat, 12 Jul 2014 03:15:31 +0000 (05:15 +0200)]
avcodec/hevc_ps: Check layer_id_included_flags count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc_ps: more complete check for vps_max_dec_pic_buffering
Michael Niedermayer [Sat, 12 Jul 2014 03:07:54 +0000 (05:07 +0200)]
avcodec/hevc_ps: more complete check for vps_max_dec_pic_buffering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: check slice_header_extension data length
Michael Niedermayer [Sat, 12 Jul 2014 03:07:16 +0000 (05:07 +0200)]
avcodec/hevc: check slice_header_extension data length

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevc: fix nb_sh / nb_sps check
Michael Niedermayer [Sat, 12 Jul 2014 02:39:01 +0000 (04:39 +0200)]
avcodec/hevc: fix nb_sh / nb_sps check

fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/libssh: set freed pointers to NULL
Lukasz Marek [Mon, 7 Jul 2014 15:23:40 +0000 (17:23 +0200)]
lavf/libssh: set freed pointers to NULL

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: fix integer overflows with sub->*display_time
Michael Niedermayer [Sat, 12 Jul 2014 00:11:02 +0000 (02:11 +0200)]
ffmpeg: fix integer overflows with sub->*display_time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pgssubdec: Fix input pts
Michael Niedermayer [Fri, 11 Jul 2014 22:40:12 +0000 (00:40 +0200)]
avcodec/pgssubdec: Fix input pts

Fixes part of Ticket2516

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'
Michael Niedermayer [Fri, 11 Jul 2014 18:35:26 +0000 (20:35 +0200)]
Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'

* commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9':
  examples/output: Remove unused variable

See: 9b211c43dc5f2e618f204c4a7fd184eb2ea51f02
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1173320249745eab01c901a39054fc0fced33c87'
Michael Niedermayer [Fri, 11 Jul 2014 18:29:40 +0000 (20:29 +0200)]
Merge commit '1173320249745eab01c901a39054fc0fced33c87'

* commit '1173320249745eab01c901a39054fc0fced33c87':
  dsputil: Drop unused bit_depth parameter from all init functions

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoexamples/output: Remove unused variable
Diego Biurrun [Fri, 11 Jul 2014 13:49:16 +0000 (06:49 -0700)]
examples/output: Remove unused variable

doc/examples/output.c:460:9: warning: unused variable ‘i’

4 years agodsputil: Drop unused bit_depth parameter from all init functions
Diego Biurrun [Tue, 8 Jul 2014 15:31:15 +0000 (08:31 -0700)]
dsputil: Drop unused bit_depth parameter from all init functions

4 years agoavformat/wavenc: use av_mallocz_array()
Paul B Mahol [Fri, 11 Jul 2014 10:38:45 +0000 (10:38 +0000)]
avformat/wavenc: use av_mallocz_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/mpegts: skip updating programs/streams when determining duration
Michael Niedermayer [Fri, 11 Jul 2014 14:42:52 +0000 (16:42 +0200)]
avformat/mpegts: skip updating programs/streams when determining duration

Fixes Ticket2441

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_decimate: Use av_malloc_array()
Michael Niedermayer [Fri, 11 Jul 2014 13:32:27 +0000 (15:32 +0200)]
avfilter/vf_decimate: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_deshake: Use av_malloc_array()
Michael Niedermayer [Fri, 11 Jul 2014 13:30:41 +0000 (15:30 +0200)]
avfilter/vf_deshake: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_libopencv: Use av_mallocz_array()
Michael Niedermayer [Fri, 11 Jul 2014 13:00:49 +0000 (15:00 +0200)]
avfilter/vf_libopencv: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'
Michael Niedermayer [Fri, 11 Jul 2014 11:07:26 +0000 (13:07 +0200)]
Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'

* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
  mov: Clarify tkhd flag settings

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'
Michael Niedermayer [Fri, 11 Jul 2014 10:41:57 +0000 (12:41 +0200)]
Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'

* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
  mov: Do not group tracks if more than one is enabled per type

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '458e7c94830d1522997e33a0b5e87bd709e8a349'
Michael Niedermayer [Fri, 11 Jul 2014 10:18:52 +0000 (12:18 +0200)]
Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349'

* commit '458e7c94830d1522997e33a0b5e87bd709e8a349':
  hevc: implement pic_output_flag handling

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c

See: 2eddf3a6efd80aa6e9d7f42ad9a892a82c5ece70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'
Michael Niedermayer [Fri, 11 Jul 2014 10:05:47 +0000 (12:05 +0200)]
Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa'

* commit 'f43789b76e661acd93c21664678f140e53cfa1fa':
  hevc: set the keyframe flag on output frames

See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1493b237bd3f9707319ac58d315ce45312900c10'
Michael Niedermayer [Fri, 11 Jul 2014 09:54:23 +0000 (11:54 +0200)]
Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'

* commit '1493b237bd3f9707319ac58d315ce45312900c10':
  hevc: Replace nal type chek with equivalent IS_IRAP macro

Conflicts:
libavcodec/hevc.c

See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'
Michael Niedermayer [Fri, 11 Jul 2014 09:42:05 +0000 (11:42 +0200)]
Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'

* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
  hevc_ps: remove a write-only variable

Conflicts:
libavcodec/hevc_ps.c

See: ba70563d5549fdbde4c254c9334a123c439ccc30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: Clarify tkhd flag settings
Luca Barbato [Fri, 4 Jul 2014 14:53:31 +0000 (16:53 +0200)]
mov: Clarify tkhd flag settings

4 years agomov: Do not group tracks if more than one is enabled per type
Luca Barbato [Fri, 4 Jul 2014 14:26:06 +0000 (16:26 +0200)]
mov: Do not group tracks if more than one is enabled per type

The specification requires at most 1 track enabled per alternate group.

4 years agohevc: implement pic_output_flag handling
Gildas Cocherel [Fri, 4 Jul 2014 15:21:56 +0000 (11:21 -0400)]
hevc: implement pic_output_flag handling

Sample-Id: OPFLAG_B_Qualcomm_1.bit, OPFLAG_C_Qualcomm_1.bit
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agohevc: set the keyframe flag on output frames
Mickaël Raulet [Fri, 4 Jul 2014 15:21:55 +0000 (11:21 -0400)]
hevc: set the keyframe flag on output frames

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agohevc: Replace nal type chek with equivalent IS_IRAP macro
Mickaël Raulet [Fri, 4 Jul 2014 15:21:54 +0000 (11:21 -0400)]
hevc: Replace nal type chek with equivalent IS_IRAP macro

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agohevc_ps: remove a write-only variable
Anton Khirnov [Fri, 11 Jul 2014 08:38:51 +0000 (08:38 +0000)]
hevc_ps: remove a write-only variable

4 years agoavcodec/rv34: fix crash while seeking on very damaged file
Michael Niedermayer [Fri, 11 Jul 2014 03:34:13 +0000 (05:34 +0200)]
avcodec/rv34: fix crash while seeking on very damaged file

Fixes null pointer dereference
Fixes Ticket2093

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/cdg: Do not fail if filesize cannot be determined
Michael Niedermayer [Thu, 10 Jul 2014 23:04:04 +0000 (01:04 +0200)]
avformat/cdg: Do not fail if filesize cannot be determined

This fixes cdg with piped input which was broken by the previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '44386aaad870cbd80ae0d08247ebc663476446ff'
Michael Niedermayer [Thu, 10 Jul 2014 22:49:52 +0000 (00:49 +0200)]
Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'

* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
  cdg: Forward error from avio_size() in read_header() function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocdg: Forward error from avio_size() in read_header() function
Nidhi Makhijani [Thu, 10 Jul 2014 08:14:51 +0000 (13:44 +0530)]
cdg: Forward error from avio_size() in read_header() function

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agox86/yadif-10: remove duplicate ABS macro
James Almer [Tue, 8 Jul 2014 16:50:05 +0000 (13:50 -0300)]
x86/yadif-10: remove duplicate ABS macro

And use the x86util ones instead, which are optimized for mmxext/sse2.
About ~1% increase in performance on pre SSSE3 processors.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: derive partial merge list
Christophe Gisquet [Thu, 10 Jul 2014 06:47:52 +0000 (06:47 +0000)]
hevc: derive partial merge list

The merge list only needs to be derived up to the merge index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: derive partially amvp list
Christophe Gisquet [Thu, 10 Jul 2014 06:47:53 +0000 (06:47 +0000)]
hevc: derive partially amvp list

When the candidate has been found, no need to derive others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix 2 coeffecient typo
Clément Bœsch [Thu, 10 Jul 2014 13:29:54 +0000 (15:29 +0200)]
Fix 2 coeffecient typo

4 years agohevc: reorder loops
Christophe Gisquet [Thu, 10 Jul 2014 06:47:56 +0000 (06:47 +0000)]
hevc: reorder loops

iterate over memory in a more continuous order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: simplify rounding
Christophe Gisquet [Thu, 10 Jul 2014 06:47:55 +0000 (06:47 +0000)]
hevc: simplify rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: rawvideo decoder depends on bswapdsp
Yu Xiaolei [Thu, 10 Jul 2014 10:40:05 +0000 (18:40 +0800)]
build: rawvideo decoder depends on bswapdsp

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'
Michael Niedermayer [Thu, 10 Jul 2014 11:14:27 +0000 (13:14 +0200)]
Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'

* commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a':
  mpegts: pass MpegTSContext ptr explicitly

See: 8635954335061ea4c03d3f492b7bc803ea740d9c:
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: add a signalstats example
Dave Rice [Wed, 9 Jul 2014 03:41:47 +0000 (23:41 -0400)]
doc/filters: add a signalstats example

Signed-off-by: Dave Rice <dave@dericed.com>
4 years agompegts: pass MpegTSContext ptr explicitly
Alexander V. Lukyanov [Tue, 8 Jul 2014 07:54:15 +0000 (11:54 +0400)]
mpegts: pass MpegTSContext ptr explicitly

AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

Within libav, the write_section_data function doesn't actually use
the MpegTSContext at all, so this doesn't change anything at the
moment (no memory was corrupted before), but it reduces the risk of
anybody trying to touch the MpegTSContext via AVFormatContext->priv_data
in the future.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoFix compilation with --disable-everything.
Carl Eugen Hoyos [Thu, 10 Jul 2014 06:26:59 +0000 (08:26 +0200)]
Fix compilation with --disable-everything.

4 years agoalpha/pixblockdsp: move code out of dsputil
James Almer [Thu, 10 Jul 2014 01:16:29 +0000 (22:16 -0300)]
alpha/pixblockdsp: move code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: fix select vs. deps
Michael Niedermayer [Thu, 10 Jul 2014 00:32:25 +0000 (02:32 +0200)]
configure: fix select vs. deps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agogitignore: add examples/transcoding
Lukasz Marek [Wed, 9 Jul 2014 23:25:40 +0000 (01:25 +0200)]
gitignore: add examples/transcoding

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add new dependencies for spp & mpdecimate
Michael Niedermayer [Wed, 9 Jul 2014 23:34:16 +0000 (01:34 +0200)]
configure: add new dependencies for spp & mpdecimate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
Michael Niedermayer [Wed, 9 Jul 2014 22:56:05 +0000 (00:56 +0200)]
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
  dsputil: Split off pixel block routines into their own context

Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: correctly compute target duration
Nicolas Martyanoff [Mon, 7 Jul 2014 11:26:12 +0000 (13:26 +0200)]
avformat/hlsenc: correctly compute target duration

With HLS, the duration of all segments must be lower or equal to the target
duration. Therefore floor(duration + 0.5) yields incorrect results.

For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the
correct result is 2.0.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
4 years agoavcodec/hevc_sei: factor return 1 out of if/else chain
Michael Niedermayer [Wed, 9 Jul 2014 22:16:29 +0000 (00:16 +0200)]
avcodec/hevc_sei: factor return 1 out of if/else chain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
Michael Niedermayer [Wed, 9 Jul 2014 22:15:34 +0000 (00:15 +0200)]
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'

* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
  hevc: parse display orientation SEI message

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
Michael Niedermayer [Wed, 9 Jul 2014 22:07:04 +0000 (00:07 +0200)]
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'

* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
  h264: parse display orientation SEI message

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'
Michael Niedermayer [Wed, 9 Jul 2014 21:57:20 +0000 (23:57 +0200)]
Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'

* commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4':
  display: add matrix flip api

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'
Michael Niedermayer [Wed, 9 Jul 2014 21:45:58 +0000 (23:45 +0200)]
Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'

* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
  doc: mention option to mix shared/static libraries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0307cc2253e76772b1c645ac6117d08da87a147c'
Michael Niedermayer [Wed, 9 Jul 2014 21:40:09 +0000 (23:40 +0200)]
Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'

* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
  rtpdec: pass an AVFormatContext to ff_parse_fmtp()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'
Michael Niedermayer [Wed, 9 Jul 2014 21:34:33 +0000 (23:34 +0200)]
Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:
libavformat/yuv4mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'
Michael Niedermayer [Wed, 9 Jul 2014 21:26:09 +0000 (23:26 +0200)]
Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'

* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
  nsvdec: remove commented out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'
Michael Niedermayer [Wed, 9 Jul 2014 21:18:50 +0000 (23:18 +0200)]
Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'

* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f':
  mov: free the dv demux context with avformat_free_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'
Michael Niedermayer [Wed, 9 Jul 2014 21:11:01 +0000 (23:11 +0200)]
Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
  mtv: do not set sample_rate for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
Michael Niedermayer [Wed, 9 Jul 2014 20:48:25 +0000 (22:48 +0200)]
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'

* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
  oggparsecelt: do not set AVCodecContext.frame_size

Conflicts:
libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
Michael Niedermayer [Wed, 9 Jul 2014 20:37:42 +0000 (22:37 +0200)]
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'

* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
  adxdec: get rid of an avpriv function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
Michael Niedermayer [Wed, 9 Jul 2014 20:21:46 +0000 (22:21 +0200)]
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'

* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
  lavc: export DV profile API used by muxer/demuxer as public

Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: remove common factors from copied timebase
Michael Niedermayer [Wed, 9 Jul 2014 19:48:16 +0000 (21:48 +0200)]
ffmpeg: remove common factors from copied timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3f3232a371cc88696184d9aef1f812656264e56c'
Michael Niedermayer [Wed, 9 Jul 2014 19:44:25 +0000 (21:44 +0200)]
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'
Michael Niedermayer [Wed, 9 Jul 2014 19:37:05 +0000 (21:37 +0200)]
Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'

* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
  avformat: update muxing doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'
Michael Niedermayer [Wed, 9 Jul 2014 19:29:21 +0000 (21:29 +0200)]
Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: Print the correct max resolution
Michael Niedermayer [Wed, 9 Jul 2014 19:14:24 +0000 (21:14 +0200)]
avcodec/roqvideoenc: Print the correct max resolution

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: More verbose warning about no power of 2 dimensions
Michael Niedermayer [Wed, 9 Jul 2014 19:10:13 +0000 (21:10 +0200)]
avcodec/roqvideoenc: More verbose warning about no power of 2 dimensions

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvdsubenc: Add dvdsub workaround for some players
Oliver Fromme [Wed, 9 Jul 2014 16:43:58 +0000 (18:43 +0200)]
avcodec/dvdsubenc: Add dvdsub workaround for some players

The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pthread_frame: fix setting hwaccel with threads and get_format()
Michael Niedermayer [Wed, 9 Jul 2014 17:51:49 +0000 (19:51 +0200)]
avcodec/pthread_frame: fix setting hwaccel with threads and get_format()

Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

Tested-by: oromit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/bprint:ædd io.h, try to fix msvc build
Michael Niedermayer [Wed, 9 Jul 2014 15:58:20 +0000 (17:58 +0200)]
avutil/bprint:ædd io.h, try to fix msvc build

Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodsputil: Split off pixel block routines into their own context
Diego Biurrun [Mon, 3 Feb 2014 22:29:09 +0000 (14:29 -0800)]
dsputil: Split off pixel block routines into their own context

4 years agoavformat/m4vdec: raise threshold slightly for detection
Michael Niedermayer [Wed, 9 Jul 2014 15:02:34 +0000 (17:02 +0200)]
avformat/m4vdec: raise threshold slightly for detection

Fixes Ticket3746

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: parse display orientation SEI message
Vittorio Giovara [Wed, 2 Jul 2014 16:02:15 +0000 (12:02 -0400)]
hevc: parse display orientation SEI message

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoh264: parse display orientation SEI message
Vittorio Giovara [Wed, 2 Jul 2014 15:58:19 +0000 (11:58 -0400)]
h264: parse display orientation SEI message

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodisplay: add matrix flip api
Vittorio Giovara [Wed, 18 Jun 2014 22:08:20 +0000 (18:08 -0400)]
display: add matrix flip api

4 years agoavcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained
Michael Niedermayer [Wed, 9 Jul 2014 13:53:23 +0000 (15:53 +0200)]
avcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: mention option to mix shared/static libraries
Andrew Kelley [Thu, 3 Jul 2014 20:22:33 +0000 (16:22 -0400)]
doc: mention option to mix shared/static libraries

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agortpdec: pass an AVFormatContext to ff_parse_fmtp()
Anton Khirnov [Sat, 5 Jul 2014 07:01:07 +0000 (07:01 +0000)]
rtpdec: pass an AVFormatContext to ff_parse_fmtp()

Use it for logging, instead of NULL or the stream codec context.

4 years agoyuv4mpegenc: do not access AVCodecContext.coded_frame
Anton Khirnov [Sat, 5 Jul 2014 06:44:00 +0000 (06:44 +0000)]
yuv4mpegenc: do not access AVCodecContext.coded_frame

Its contents are meaningful only if the stream codec context is the one
actually used for encoding, which is often not the case (and is
discouraged).

Use AVCodecContext.field_order instead.

4 years agonsvdec: remove commented out cruft
Anton Khirnov [Thu, 19 Jun 2014 07:13:19 +0000 (09:13 +0200)]
nsvdec: remove commented out cruft