]> git.sesse.net Git - ffmpeg/log
ffmpeg
10 years agox86/hevc_deblock: improve chroma functions register allocation
James Almer [Fri, 23 May 2014 03:37:24 +0000 (00:37 -0300)]
x86/hevc_deblock: improve chroma functions register allocation

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffplay: support rotated video.
Clément Bœsch [Fri, 18 Apr 2014 21:15:54 +0000 (23:15 +0200)]
ffplay: support rotated video.

with -f lavfi -i testsrc=s=hd1080 as source:
  rotate=90*PI/180  vs transpose=clock:   42fps -> 64fps
  rotate=180*PI/180 vs vflip,hflip:       75fps -> 77fps
  rotate=270*PI/180 vs transpose=cclock:  43fps -> 63fps

10 years agoavformat/mov: use av_display_rotation_get() for rotate metadata.
Clément Bœsch [Tue, 20 May 2014 17:51:27 +0000 (19:51 +0200)]
avformat/mov: use av_display_rotation_get() for rotate metadata.

10 years agoavutil/display: use hypot().
Clément Bœsch [Tue, 20 May 2014 17:51:03 +0000 (19:51 +0200)]
avutil/display: use hypot().

10 years agox86/dsputil: fix argument declaration in vector_clipf
James Almer [Fri, 23 May 2014 18:11:40 +0000 (15:11 -0300)]
x86/dsputil: fix argument declaration in vector_clipf

Should fix fate failures in msvc x86_64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86/dsputil: fix VECTOR_CLIP_INT32 macro
James Almer [Fri, 23 May 2014 07:05:43 +0000 (04:05 -0300)]
x86/dsputil: fix VECTOR_CLIP_INT32 macro

The inline loop was incrementing and using the value of %%i
the wrong way.

Disassembly of ff_vector_clip_int32_sse2 before and after
this patch:

    movdqa (%rdx),%xmm0      |  movdqa (%rdx),%xmm0
    movdqa 0x10(%rdx),%xmm1  |  movdqa 0x10(%rdx),%xmm1
    movdqa 0x20(%rdx),%xmm2  |  movdqa 0x20(%rdx),%xmm2
    movdqa 0x30(%rdx),%xmm3  |  movdqa 0x30(%rdx),%xmm3
[...]                        |
    movdqa %xmm0,(%rcx)      |  movdqa %xmm0,(%rcx)
    movdqa %xmm1,0x10(%rcx)  |  movdqa %xmm1,0x10(%rcx)
    movdqa %xmm2,0x20(%rcx)  |  movdqa %xmm2,0x20(%rcx)
    movdqa %xmm3,0x30(%rcx)  |  movdqa %xmm3,0x30(%rcx)
    movdqa (%rdx),%xmm0      |  movdqa 0x40(%rdx),%xmm0
    movdqa 0x20(%rdx),%xmm1  |  movdqa 0x50(%rdx),%xmm1
    movdqa 0x40(%rdx),%xmm2  |  movdqa 0x60(%rdx),%xmm2
    movdqa 0x60(%rdx),%xmm3  |  movdqa 0x70(%rdx),%xmm3
[...]                        |
    movdqa %xmm0,(%rcx)      |  movdqa %xmm0,0x40(%rcx)
    movdqa %xmm1,0x20(%rcx)  |  movdqa %xmm1,0x50(%rcx)
    movdqa %xmm2,0x40(%rcx)  |  movdqa %xmm2,0x60(%rcx)
    movdqa %xmm3,0x60(%rcx)  |  movdqa %xmm3,0x70(%rcx)
    add    $0x80,%rdx        |  add    $0x80,%rdx
    add    $0x80,%rcx        |  add    $0x80,%rcx

Other versions were unaffected.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/dcadec: dont use hex float, msvc doesnt support it
Michael Niedermayer [Fri, 23 May 2014 20:33:55 +0000 (22:33 +0200)]
avcodec/dcadec: dont use hex float, msvc doesnt support it

Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/dcadec: use a constant instead of assuming every compiler can optimize pow...
Michael Niedermayer [Fri, 23 May 2014 20:15:57 +0000 (22:15 +0200)]
avcodec/dcadec: use a constant instead of assuming every compiler can optimize pow(2,-15)

Idea-by: nevcairiel and wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/dcadec: make dca_dmix_code() 650% faster
Michael Niedermayer [Fri, 23 May 2014 19:59:04 +0000 (21:59 +0200)]
avcodec/dcadec: make dca_dmix_code() 650% faster

This effectively replaces the ldexpf() function call by a multiplication
with a constant.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 23 May 2014 19:13:39 +0000 (21:13 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Refuse to mux H.264 with fourcc H264 into avi without startcode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'
Michael Niedermayer [Fri, 23 May 2014 18:48:54 +0000 (20:48 +0200)]
Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'

* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800':
  avcodec: bump version after rotation api

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodcadec: fix xxch_dmix_coeff and xxch_dmix_sf after merge
Michael Niedermayer [Fri, 23 May 2014 17:17:27 +0000 (19:17 +0200)]
dcadec: fix xxch_dmix_coeff and xxch_dmix_sf after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '6b7b8585d73548f08b98959df39d80b97677662f'
Michael Niedermayer [Fri, 23 May 2014 17:01:12 +0000 (19:01 +0200)]
Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'

* commit '6b7b8585d73548f08b98959df39d80b97677662f':
  dca: Convert dca_dmixtable to integers

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec: bump version after rotation api
Vittorio Giovara [Tue, 20 May 2014 15:13:12 +0000 (11:13 -0400)]
avcodec: bump version after rotation api

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
10 years agoRefuse to mux H.264 with fourcc H264 into avi without startcode.
Carl Eugen Hoyos [Fri, 23 May 2014 14:20:22 +0000 (16:20 +0200)]
Refuse to mux H.264 with fourcc H264 into avi without startcode.

Fixes ticket #3638.

10 years agodca: Convert dca_dmixtable to integers
Niels Möller [Tue, 6 May 2014 07:41:05 +0000 (09:41 +0200)]
dca: Convert dca_dmixtable to integers

Also include zero in the table, eliminating a special case in the
decoder.

Signed-off-by: Niels Möller <nisse@southpole.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agox86/diracdsp: mark all functions as yasm
James Almer [Fri, 23 May 2014 03:33:27 +0000 (00:33 -0300)]
x86/diracdsp: mark all functions as yasm

No inline asm dirac code remains in the tree, so replace every relevant check.
This also moves all the dirac functions from dsputil_mmx.c to diracdsp_mmx.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/mov: Dont blindly trust the stream duration in seting chapter times
Michael Niedermayer [Fri, 23 May 2014 02:39:55 +0000 (04:39 +0200)]
avformat/mov: Dont blindly trust the stream duration in seting chapter times

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/utils: Check end time in avpriv_new_chapter()
Michael Niedermayer [Fri, 23 May 2014 02:33:05 +0000 (04:33 +0200)]
avformat/utils: Check end time in avpriv_new_chapter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/movenc: Check that packet duration is valid in ff_mov_write_packet()
Michael Niedermayer [Fri, 23 May 2014 01:59:32 +0000 (03:59 +0200)]
avformat/movenc: Check that packet duration is valid in ff_mov_write_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86/dsputil: port ff_vector_clipf_sse to yasm
James Almer [Thu, 22 May 2014 19:28:43 +0000 (16:28 -0300)]
x86/dsputil: port ff_vector_clipf_sse to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoFix the mime types for MPEG and MPEG-TS formats
Florent Le Coz [Wed, 21 May 2014 13:27:09 +0000 (15:27 +0200)]
Fix the mime types for MPEG and MPEG-TS formats

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

10 years agox86: hpeldsp: avg_pixels_xy2 for mmx2&3dnow
Christophe Gisquet [Thu, 22 May 2014 17:48:18 +0000 (17:48 +0000)]
x86: hpeldsp: avg_pixels_xy2 for mmx2&3dnow

This is a port of the inline assembly of the mmx version to use the
pavg(us|)b instruction.

        8    16
mmx   1498  4355
mmx2  1242  3509

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86: hpeldsp: mark _xy2 versions as approximate
Christophe Gisquet [Thu, 22 May 2014 17:48:17 +0000 (17:48 +0000)]
x86: hpeldsp: mark _xy2 versions as approximate

Currently, only the mmx version is bitexact, the others (mmxext and
3dnow) are not, in spite of their naming.

Therefore, make their name more obvious. Also restore a comment that
was removed in 71155d7b.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86: hpeldsp: kill hpeldsp_mmx.c
Christophe Gisquet [Thu, 22 May 2014 17:48:16 +0000 (17:48 +0000)]
x86: hpeldsp: kill hpeldsp_mmx.c

before:
1987 decicycles in 8_x2, 262121 runs, 23 skips

after:
1902 decicycles in 8_x2, 262112 runs, 32 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agomaintainers: adding myself as a maintainer to webm dash
Vignesh Venkatasubramanian [Thu, 22 May 2014 17:31:05 +0000 (10:31 -0700)]
maintainers: adding myself as a maintainer to webm dash

adding myself as a maintainer to webm dash (part of matroskaenc.c)

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolibavformat/matroskaenc: Add WebM DASH support
Vignesh Venkatasubramanian [Wed, 7 May 2014 16:46:40 +0000 (09:46 -0700)]
libavformat/matroskaenc: Add WebM DASH support

WebM DASH specification [1] requires the Clusters and Cues to be output in a
specific way. Adding a flag to matroskaenc that will enable support for
creating WebM/Mkv files conforming to the WebM DASH specification.

[1] http://wiki.webmproject.org/adaptive-streaming/webm-dash-specification

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 22 May 2014 13:27:18 +0000 (15:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect Asterisk raw pcm with extension "sln".

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoAutodetect Asterisk raw pcm with extension "sln".
Carl Eugen Hoyos [Thu, 22 May 2014 13:15:04 +0000 (15:15 +0200)]
Autodetect Asterisk raw pcm with extension "sln".

10 years agoavdevice/v4l2: Use av_malloc_array()
Michael Niedermayer [Thu, 22 May 2014 13:08:12 +0000 (15:08 +0200)]
avdevice/v4l2: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/proresdec2: Use av_malloc_array()
Michael Niedermayer [Thu, 22 May 2014 13:05:27 +0000 (15:05 +0200)]
avcodec/proresdec2: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/pgssubdec: Use av_malloc(z)_array()
Michael Niedermayer [Thu, 22 May 2014 13:04:34 +0000 (15:04 +0200)]
avcodec/pgssubdec: Use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/vdpau_internal: move "struct vdpau_picture_context" up to avoid "#else"
Michael Niedermayer [Wed, 21 May 2014 23:53:54 +0000 (01:53 +0200)]
avcodec/vdpau_internal: move "struct vdpau_picture_context" up to avoid "#else"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoFix compilation error around struct visibility when VDPAU disabled.
Dale Curtis [Tue, 20 May 2014 19:03:58 +0000 (12:03 -0700)]
Fix compilation error around struct visibility when VDPAU disabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86/dsputil: port ff_put_signed_pixels_clamped_mmx to yasm
James Almer [Wed, 21 May 2014 21:02:39 +0000 (18:02 -0300)]
x86/dsputil: port ff_put_signed_pixels_clamped_mmx to yasm

Also add an SSE2 version

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86/dsputil: port clear_block functions to yasm
James Almer [Wed, 21 May 2014 06:53:31 +0000 (03:53 -0300)]
x86/dsputil: port clear_block functions to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoDon't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().
Carl Eugen Hoyos [Wed, 21 May 2014 20:48:11 +0000 (22:48 +0200)]
Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().

Fixes ticket #3660.

10 years agosws: document color range >8bit oddity
Michael Niedermayer [Wed, 21 May 2014 19:29:33 +0000 (21:29 +0200)]
sws: document color range >8bit oddity

10 years agoffmpeg: use av_stream_get_end_pts()
Michael Niedermayer [Mon, 19 May 2014 18:16:22 +0000 (20:16 +0200)]
ffmpeg: use av_stream_get_end_pts()

Simplifies code and should correct timing values when -*sync drop is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat: add av_stream_get_end_pts()
Michael Niedermayer [Mon, 19 May 2014 18:16:01 +0000 (20:16 +0200)]
avformat: add av_stream_get_end_pts()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/utils: add error message for the recode_subtitle() without iconv case
Michael Niedermayer [Wed, 21 May 2014 15:33:58 +0000 (17:33 +0200)]
avcodec/utils: add error message for the recode_subtitle() without iconv case

Based on the assert command which was removed in ef0c466a0fef4657d3f46cc9adea97e76a8e4faa

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoReplace assert with AVERROR when recode_subtitle called w/o ICONV.
Dale Curtis [Tue, 20 May 2014 19:03:57 +0000 (12:03 -0700)]
Replace assert with AVERROR when recode_subtitle called w/o ICONV.

recode_subtitle() is called implicitly by avformat_find_stream_info().
As such, clients which disable ICONV always crash if a file contains
subtitles; even if they don't care about them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/atrac3plusdec: Use av_mallocz_array()
Michael Niedermayer [Wed, 21 May 2014 14:00:14 +0000 (16:00 +0200)]
avcodec/atrac3plusdec: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/atrac3: Use av_mallocz_array()
Michael Niedermayer [Wed, 21 May 2014 13:59:56 +0000 (15:59 +0200)]
avcodec/atrac3: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffprobe: Use av_malloc_array()
Michael Niedermayer [Wed, 21 May 2014 13:59:22 +0000 (15:59 +0200)]
ffprobe: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/x86/hpeldsp_init: remove redundant if()
Michael Niedermayer [Wed, 21 May 2014 11:38:27 +0000 (13:38 +0200)]
avcodec/x86/hpeldsp_init: remove redundant if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agohpeldsp: fix build without inline asm
Hendrik Leppkes [Wed, 21 May 2014 09:19:29 +0000 (11:19 +0200)]
hpeldsp: fix build without inline asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agox86: kill fpel_mmx.c
Christophe Gisquet [Mon, 19 May 2014 08:02:19 +0000 (10:02 +0200)]
x86: kill fpel_mmx.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE
Michael Niedermayer [Wed, 21 May 2014 01:02:06 +0000 (03:02 +0200)]
avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoFix compilation errors when deprecated features are disabled.
Dale Curtis [Tue, 20 May 2014 19:03:56 +0000 (12:03 -0700)]
Fix compilation errors when deprecated features are disabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/h264_picture: Fix build without error resilience
Michael Niedermayer [Tue, 20 May 2014 19:31:40 +0000 (21:31 +0200)]
avcodec/h264_picture: Fix build without error resilience

Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoFix build with --enable-ladspa --disable-frei0r.
Alexis Ballier [Tue, 20 May 2014 18:07:54 +0000 (20:07 +0200)]
Fix build with --enable-ladspa --disable-frei0r.

https://bugs.gentoo.org/show_bug.cgi?id=510516

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoconfigure: arm: do not enable fast-unaligned if it is explicitly disabled via commandline
Yu Xiaolei [Tue, 20 May 2014 02:14:05 +0000 (10:14 +0800)]
configure: arm: do not enable fast-unaligned if it is explicitly disabled via commandline

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavutil/cpu: force mmx on selection of higher x86 SIMD features
Michael Niedermayer [Tue, 20 May 2014 03:23:52 +0000 (05:23 +0200)]
avutil/cpu: force mmx on selection of higher x86 SIMD features

Fixes various runtime failures with manually set flags that represent no
existing CPU

Fixes Ticket3653

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/fate-idct8x8: Defined behavior: eliminate negative left-shifts.
Katerina Barone-Adesi [Mon, 19 May 2014 15:27:52 +0000 (17:27 +0200)]
avcodec/fate-idct8x8: Defined behavior: eliminate negative left-shifts.

The original code left-shifts negative values, which is undefined
in the C99 specification (the one used during normal FFmpeg compilation).
This change multiplies by (1 << shift), which is functionally equivalent,
but has defined behavior.
With this change, fate-idct8x8 compiled with --fsanitize=undefined works.

Bug-Id: 686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The assembly generated by gcc is unchanged by this commit

10 years agoMerge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'
Michael Niedermayer [Tue, 20 May 2014 01:39:04 +0000 (03:39 +0200)]
Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'

* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
  lavf: add av_stream_get_side_data

Conflicts:
doc/APIchanges
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'afe176265480880e1f702c96a8ba434b0d88728b'
Michael Niedermayer [Tue, 20 May 2014 01:33:30 +0000 (03:33 +0200)]
Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

* commit 'afe176265480880e1f702c96a8ba434b0d88728b':
  build: export library dependencies in ${name}_FFLIBS

Conflicts:
common.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa'
Michael Niedermayer [Tue, 20 May 2014 00:48:56 +0000 (02:48 +0200)]
Merge commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa'

* commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa':
  check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)

See: beeb7551d6ab44bc6a1125e6d537508bff3694fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/mux: Remove localized encoder strings
Michael Niedermayer [Tue, 20 May 2014 00:30:26 +0000 (02:30 +0200)]
avformat/mux: Remove localized encoder strings

Fixes muxing to end up with a encoder=Lavf... and encoder_eng=somethingelse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/smvjpegdec: Dont ignore avcodec_close() return code
Michael Niedermayer [Tue, 20 May 2014 00:21:07 +0000 (02:21 +0200)]
avcodec/smvjpegdec: Dont ignore avcodec_close() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec: remove no longer needed ff_codec_close_recursive()
Michael Niedermayer [Tue, 20 May 2014 00:20:30 +0000 (02:20 +0200)]
avcodec: remove no longer needed ff_codec_close_recursive()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffmpeg_opt: dont copy "encoder" metadata unless stream copy is used
Michael Niedermayer [Mon, 19 May 2014 23:33:22 +0000 (01:33 +0200)]
ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffmpeg/set_encoder_id: dont allocate encoder string if one is already set
Michael Niedermayer [Mon, 19 May 2014 22:50:27 +0000 (00:50 +0200)]
ffmpeg/set_encoder_id: dont allocate encoder string if one is already set

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolavf: add av_stream_get_side_data
Janne Grunau [Mon, 19 May 2014 14:29:30 +0000 (16:29 +0200)]
lavf: add av_stream_get_side_data

10 years agobuild: export library dependencies in ${name}_FFLIBS
Janne Grunau [Thu, 15 May 2014 16:11:19 +0000 (18:11 +0200)]
build: export library dependencies in ${name}_FFLIBS

Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.

10 years agocheck: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)
Janne Grunau [Thu, 15 May 2014 15:57:16 +0000 (17:57 +0200)]
check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)

10 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Mon, 19 May 2014 22:22:48 +0000 (00:22 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: favour EPSV over PASV command
  lavf/audiointerleave: return more meaningful error codes
  lavf/audiointerleave: check for allocation failure
  lavf/audiointerleave: use av_fifo_alloc_array
  lavf/dvenc: use av_fifo_alloc_array
  lavc/flac_parser: use av_fifo_alloc_array
  lavc/frame_thread_encoder: use av_fifo_alloc_array
  lavfi/vf_fps: use av_fifo_alloc_array
  lavfi/buffersink: use av_fifo_alloc_array
  ffmpeg: use av_fifo_alloc_array
  lavd/jack_audio: use av_fifo_alloc_array
  lavu/fifo: add av_fifo_alloc_array function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/dvdsubenc: accept forced flag
Oliver Fromme [Sun, 18 May 2014 13:29:28 +0000 (15:29 +0200)]
avcodec/dvdsubenc: accept forced flag

Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolavf/ftp: favour EPSV over PASV command
Lukasz Marek [Mon, 19 May 2014 21:53:08 +0000 (23:53 +0200)]
lavf/ftp: favour EPSV over PASV command

EPSV is newer version of PASV and allows to use IPv6.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavf/audiointerleave: return more meaningful error codes
Lukasz Marek [Sun, 11 May 2014 03:40:25 +0000 (05:40 +0200)]
lavf/audiointerleave: return more meaningful error codes

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavf/audiointerleave: check for allocation failure
Lukasz Marek [Sun, 11 May 2014 03:33:56 +0000 (05:33 +0200)]
lavf/audiointerleave: check for allocation failure

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavf/audiointerleave: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:29:19 +0000 (05:29 +0200)]
lavf/audiointerleave: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavf/dvenc: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:26:31 +0000 (05:26 +0200)]
lavf/dvenc: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavc/flac_parser: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:24:45 +0000 (05:24 +0200)]
lavc/flac_parser: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavc/frame_thread_encoder: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:22:43 +0000 (05:22 +0200)]
lavc/frame_thread_encoder: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavfi/vf_fps: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:20:44 +0000 (05:20 +0200)]
lavfi/vf_fps: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavfi/buffersink: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:18:38 +0000 (05:18 +0200)]
lavfi/buffersink: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agoffmpeg: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:15:49 +0000 (05:15 +0200)]
ffmpeg: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavd/jack_audio: use av_fifo_alloc_array
Lukasz Marek [Sun, 11 May 2014 03:13:31 +0000 (05:13 +0200)]
lavd/jack_audio: use av_fifo_alloc_array

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agolavu/fifo: add av_fifo_alloc_array function
Lukasz Marek [Sat, 10 May 2014 06:06:53 +0000 (08:06 +0200)]
lavu/fifo: add av_fifo_alloc_array function

Allows to alloc fifo buffer by passing
number of elements and size of element.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years agox86/hevc_deblock: use constants instead of generating values at runtime
James Almer [Mon, 19 May 2014 20:39:02 +0000 (17:39 -0300)]
x86/hevc_deblock: use constants instead of generating values at runtime

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/ppc/asm: fix build with ABI v2
Thierry FAUCK [Mon, 19 May 2014 20:03:28 +0000 (22:03 +0200)]
avcodec/ppc/asm: fix build with ABI v2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agolavc: define STRIDE_ALIGN as 32 when compiling with AVX support
James Almer [Mon, 19 May 2014 00:59:57 +0000 (21:59 -0300)]
lavc: define STRIDE_ALIGN as 32 when compiling with AVX support

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffmpeg/do_video_stats: fix used timebase
Michael Niedermayer [Mon, 19 May 2014 18:54:27 +0000 (20:54 +0200)]
ffmpeg/do_video_stats: fix used timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/pthread_frame: remove unused variable
Michael Niedermayer [Mon, 19 May 2014 17:36:29 +0000 (19:36 +0200)]
avcodec/pthread_frame: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'
Michael Niedermayer [Mon, 19 May 2014 17:28:25 +0000 (19:28 +0200)]
Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'

* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
  display: Include mathematics.h for fallback definition of NAN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'
Michael Niedermayer [Mon, 19 May 2014 17:21:53 +0000 (19:21 +0200)]
Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'

* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043':
  mov: store display matrix in a stream side data

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
Michael Niedermayer [Mon, 19 May 2014 17:12:30 +0000 (19:12 +0200)]
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'

* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
  Add transformation matrix API.

Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'
Michael Niedermayer [Mon, 19 May 2014 17:02:36 +0000 (19:02 +0200)]
Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'

* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83':
  pthread_frame: simplify the code by using new AVPacket API

Conflicts:
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'
Michael Niedermayer [Mon, 19 May 2014 16:50:40 +0000 (18:50 +0200)]
Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'

* commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b':
  avpacket: fix copying side data in av_packet_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'
Michael Niedermayer [Mon, 19 May 2014 16:38:10 +0000 (18:38 +0200)]
Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'

* commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c':
  lavf: deprecate now unused AVStream.pts

Conflicts:
libavformat/mux.c
libavformat/version.h

mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'
Michael Niedermayer [Mon, 19 May 2014 16:27:56 +0000 (18:27 +0200)]
Merge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'

* commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011':
  mux: drop one of the hacks comprising compute_pkt_fields2()

Conflicts:
libavformat/mux.c

Not merged as -async drop / -vsync drop depends on this code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/libvorbisenc: do not attempt to flush if no data was input
Michael Niedermayer [Mon, 19 May 2014 14:56:55 +0000 (16:56 +0200)]
avcodec/libvorbisenc: do not attempt to flush if no data was input

this prevents the creation of a packet even though no single sample has ever
been input, which some confusion in the timestamp generation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/libmp3lame: do not attempt to flush lame if no data was input
Michael Niedermayer [Mon, 19 May 2014 14:56:55 +0000 (16:56 +0200)]
avcodec/libmp3lame: do not attempt to flush lame if no data was input

this prevents the creation of a packet even though no single sample has ever
been input, which some confusion in the timestamp generation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodisplay: Include mathematics.h for fallback definition of NAN
Martin Storsjö [Mon, 19 May 2014 14:41:05 +0000 (17:41 +0300)]
display: Include mathematics.h for fallback definition of NAN

This fixes compilation with MSVC.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoavformat/mpegtsenc: fix dts for chained muxing aac in mpegts
Michael Niedermayer [Mon, 19 May 2014 14:30:01 +0000 (16:30 +0200)]
avformat/mpegtsenc: fix dts for chained muxing aac in mpegts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffmpeg: set dts for subtitles
Michael Niedermayer [Mon, 19 May 2014 14:07:50 +0000 (16:07 +0200)]
ffmpeg: set dts for subtitles

dts is not optional, its required for muxing,
previously it was set from AVStream.pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoffmpeg: add last_mux_dts_plus_duration
Michael Niedermayer [Mon, 19 May 2014 13:28:19 +0000 (15:28 +0200)]
ffmpeg: add last_mux_dts_plus_duration

Fixes 1 frame error in the duration and derived values,
introduced by not using AVStream.pts in the previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
Michael Niedermayer [Mon, 19 May 2014 13:13:16 +0000 (15:13 +0200)]
Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'

* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
  avconv: do not use poorly defined and undocumented AVStream.pts

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'
Michael Niedermayer [Mon, 19 May 2014 13:03:42 +0000 (15:03 +0200)]
Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'

* commit 'c9f8809ee4c576d5833865039bc1c85754448f67':
  hevc/intra_pred: simplify neighboring sample derivation

Conflicts:
libavcodec/hevcpred_template.c

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