ffmpeg.git
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Mon, 26 May 2014 14:35:47 +0000 (16:35 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: use thread message API.
  lavu: add thread message API.
  compat/w32pthreads: add return value to pthread_cond_init().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: uClibc native pthread requires -ldl
Neil Armstrong [Mon, 26 May 2014 13:21:03 +0000 (15:21 +0200)]
configure: uClibc native pthread requires -ldl

In the configure script, add a pthread detection with
-ldl added to cflags, because uClibc requires -ldl to
link with native libpthread.

Tested with a custom ARM toolchain with uClibc 0.9.33.2 and gcc 4.6.3.

Signed-off-by: Neil Armstrong <narmstrong@neotion.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: propagate changes across codecs
Christophe Gisquet [Sun, 25 May 2014 17:03:10 +0000 (19:03 +0200)]
x86: hpeldsp: propagate changes across codecs

Some codecs still use mmx versions, so have them use the versions
with newer instruction sets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: use thread message API.
Nicolas George [Thu, 20 Feb 2014 13:14:53 +0000 (14:14 +0100)]
ffmpeg: use thread message API.

5 years agolavu: add thread message API.
Nicolas George [Thu, 20 Feb 2014 13:14:34 +0000 (14:14 +0100)]
lavu: add thread message API.

5 years agocompat/w32pthreads: add return value to pthread_cond_init().
Nicolas George [Mon, 21 Apr 2014 09:14:22 +0000 (11:14 +0200)]
compat/w32pthreads: add return value to pthread_cond_init().

5 years agoavformat/mov: allow seeking back to the begin even if nothing is marked as keyframe
Michael Niedermayer [Sun, 25 May 2014 23:23:16 +0000 (01:23 +0200)]
avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe

Fixes Ticket 3663

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fix typo in date
Michael Niedermayer [Sun, 25 May 2014 23:22:29 +0000 (01:22 +0200)]
doc/APIchanges: fix typo in date

5 years agoupdate APIchanges & version for c37d179
Michael Niedermayer [Sun, 25 May 2014 22:20:07 +0000 (00:20 +0200)]
update APIchanges & version for c37d179

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add format_probesize to allow tuning the maximum amount of bytes to identif...
Michael Niedermayer [Mon, 27 Jan 2014 22:09:38 +0000 (23:09 +0100)]
avformat: add format_probesize to allow tuning the maximum amount of bytes to identify the filetype

Currently probesize is cliped at 1mb before being used for format detection.
Alternatively this cliping could be removed but this would then tie various
things like stream analysis to the file detection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sgirledec: fix () in RBG323_TO_BGR8() macro
Michael Niedermayer [Sun, 25 May 2014 21:08:51 +0000 (23:08 +0200)]
avcodec/sgirledec: fix () in RBG323_TO_BGR8() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv34: Fix () in GET_PTS_DIFF() macro
Michael Niedermayer [Sun, 25 May 2014 19:42:19 +0000 (21:42 +0200)]
avcodec/rv34: Fix () in GET_PTS_DIFF() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/psymodel: Fix () in AAC_CUTOFF() macro
Michael Niedermayer [Sun, 25 May 2014 19:41:57 +0000 (21:41 +0200)]
avcodec/psymodel: Fix () in AAC_CUTOFF() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_anatoliy: Fix () in macros
Michael Niedermayer [Sun, 25 May 2014 19:41:35 +0000 (21:41 +0200)]
avcodec/proresenc_anatoliy: Fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm"
Michael Niedermayer [Sun, 25 May 2014 17:42:18 +0000 (19:42 +0200)]
Revert "x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm"

This reverts commit ad733089b024e4a3ff8f024d247a032f79a50ac8.

breaks with --disable-yasm
revert requested by: Christophe Gisquet <christophe.gisquet@gmail.com>

5 years agoavcodec/msvideo1enc: Fix () in MKRGB555() macro
Michael Niedermayer [Sun, 25 May 2014 17:26:37 +0000 (19:26 +0200)]
avcodec/msvideo1enc: Fix () in MKRGB555() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opus: Fix () in ROUND_MULL() macro
Michael Niedermayer [Sun, 25 May 2014 17:25:58 +0000 (19:25 +0200)]
avcodec/opus: Fix () in ROUND_MULL() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opus_celt: Fix () in CELT_PVQ_V macro
Michael Niedermayer [Sun, 25 May 2014 17:25:29 +0000 (19:25 +0200)]
avcodec/opus_celt: Fix () in CELT_PVQ_V macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix () in OP_* macros
Michael Niedermayer [Sun, 25 May 2014 17:24:30 +0000 (19:24 +0200)]
avcodec/pngdec: fix () in OP_* macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm
Timothy Gu [Sat, 24 May 2014 00:18:09 +0000 (17:18 -0700)]
x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: try to fix the disappearing "r" bug in fate
Michael Niedermayer [Sun, 25 May 2014 13:44:27 +0000 (15:44 +0200)]
configure: try to fix the disappearing "r" bug in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'
Michael Niedermayer [Sun, 25 May 2014 11:07:27 +0000 (13:07 +0200)]
Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'

* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/webvttenc: do not use EOVERFLOW.
Clément Bœsch [Sun, 25 May 2014 08:27:33 +0000 (10:27 +0200)]
avcodec/webvttenc: do not use EOVERFLOW.

According to doc/errno.txt EOVERFLOW is not available everywhere. The
use of -1 is consistent with avcodec/srtenc.c.

5 years agoavcodec/mss4: Fix () in MKVAL() macro
Michael Niedermayer [Sun, 25 May 2014 03:19:09 +0000 (05:19 +0200)]
avcodec/mss4: Fix () in MKVAL() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss34dsp: fix () in SOP* macros
Michael Niedermayer [Sun, 25 May 2014 03:18:47 +0000 (05:18 +0200)]
avcodec/mss34dsp: fix () in SOP* macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mlpdec: fix () in MSB_MASK() macro
Michael Niedermayer [Sun, 25 May 2014 03:17:51 +0000 (05:17 +0200)]
avcodec/mlpdec: fix () in MSB_MASK() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ivi_dsp: add some missing () to macros
Michael Niedermayer [Sun, 25 May 2014 01:39:08 +0000 (03:39 +0200)]
avcodec/ivi_dsp: add some missing () to macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: fix () in macros
Michael Niedermayer [Sun, 25 May 2014 01:36:03 +0000 (03:36 +0200)]
avcodec/hevc: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_slice: fix macro ()
Michael Niedermayer [Sun, 25 May 2014 01:33:46 +0000 (03:33 +0200)]
avcodec/h264_slice: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: fix () in macros
Michael Niedermayer [Sun, 25 May 2014 01:30:13 +0000 (03:30 +0200)]
avcodec/h264: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/golomb-test: fix () in EXTEND() macro
Michael Niedermayer [Sun, 25 May 2014 01:27:56 +0000 (03:27 +0200)]
avcodec/golomb-test: fix () in EXTEND() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro
Michael Niedermayer [Sun, 25 May 2014 01:19:47 +0000 (03:19 +0200)]
avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/webvttenc: add webvtt encoder
Aman Gupta [Fri, 23 May 2014 04:20:34 +0000 (21:20 -0700)]
avcodec/webvttenc: add webvtt encoder

Based off the srt encoder. The following features are unimplemented:

- fonts, colors, sizes
- alignment and positioning

The rest works well. For example, use ffmpeg to convert subtitles into the .vtt format:

  ffmpeg -i input.srt output.vtt

Signed-off-by: Aman Gupta <ffmpeg@tmm1.net>
Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agox86/dsputilenc: make the SUM_ABS_DCTELEM macro more readable
James Almer [Sat, 24 May 2014 23:30:42 +0000 (20:30 -0300)]
x86/dsputilenc: make the SUM_ABS_DCTELEM macro more readable

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opusdec: check alignment, misalignment could lead to crashes with avx
Michael Niedermayer [Sat, 24 May 2014 22:38:20 +0000 (00:38 +0200)]
avcodec/opusdec: check alignment, misalignment could lead to crashes with avx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/dsputilenc: port sum_abs_dctelem functions to yasm
James Almer [Sat, 24 May 2014 04:30:28 +0000 (01:30 -0300)]
x86/dsputilenc: port sum_abs_dctelem functions to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/asvenc: dont use a negative global_quality
Michael Niedermayer [Sat, 24 May 2014 18:33:49 +0000 (20:33 +0200)]
avcodec/asvenc: dont use a negative global_quality

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacenc: dont use global quality if its negative
Michael Niedermayer [Sat, 24 May 2014 18:32:37 +0000 (20:32 +0200)]
avcodec/aacenc: dont use global quality if its negative

Some applications used a negative value as default for "not set"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: implement SSSE3 version of _xy2
Christophe Gisquet [Thu, 22 May 2014 21:47:06 +0000 (23:47 +0200)]
x86: hpeldsp: implement SSSE3 version of _xy2

Loading pb_1 rather than pw_8192 was benchmarked to be more efficient.
Loading of the 2 yields no advantage. Loading of one saves ~11 cycles.

decicycles count:
put8:  3223(mmx)    -> 2387
avg8:  2863(mmxext) -> 2125
put16: 4356(sse2)   -> 3553
avg16: 4481(sse2)   -> 3513

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8692e6284f5169257a537c8fc25addf32fc67c87'
Michael Niedermayer [Sat, 24 May 2014 11:20:14 +0000 (13:20 +0200)]
Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87'

* commit '8692e6284f5169257a537c8fc25addf32fc67c87':
  rdt: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/vobsub: do not create empty streams.
Clément Bœsch [Sat, 24 May 2014 09:03:23 +0000 (11:03 +0200)]
avformat/vobsub: do not create empty streams.

Fixes NULL dereference in vobsub_read_packet() on vobsub->q[i]->subs.

Fixes ticket #3669.

5 years agosmoothstream: check malloc calls
Nidhi Makhijani [Thu, 22 May 2014 10:50:05 +0000 (16:20 +0530)]
smoothstream: check malloc calls

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agordt: check malloc calls
Nidhi Makhijani [Fri, 23 May 2014 13:42:02 +0000 (19:12 +0530)]
rdt: check malloc calls

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoAdd metadata injection to blackdetect
Billy Shambrook [Thu, 22 May 2014 20:48:41 +0000 (21:48 +0100)]
Add metadata injection to blackdetect

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: implement SSE2 put_pixels16_xy2
Christophe Gisquet [Thu, 22 May 2014 17:48:20 +0000 (17:48 +0000)]
x86: hpeldsp: implement SSE2 put_pixels16_xy2

This is obviously equivalent to the avg version, without the avg.

3223(mmx) -> 2006(sse2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: implement SSE2 versions
Christophe Gisquet [Thu, 22 May 2014 17:48:19 +0000 (17:48 +0000)]
x86: hpeldsp: implement SSE2 versions

Those are mostly used in codecs older than H.264, eg MPEG-2.

put16 versions:
      mmx  mmx2  sse2
x2:  1888  1185   552
y2:  1778  1092   510

avg16 xy2: 3509(mmx2) -> 2169(sse2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: remove myself as website maintainer
Lou Logan [Sat, 24 May 2014 00:08:28 +0000 (16:08 -0800)]
MAINTAINERS: remove myself as website maintainer

I never implemented the plans I had for the site, and I prefer to work
in other areas of the project.

Signed-off-by: Lou Logan <lou@lrcd.com>
5 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>
5 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

5 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.

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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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".

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>