ffmpeg.git
6 years agodoc/doxy-wrapper.sh: fix execute flags
Michael Niedermayer [Sat, 15 Feb 2014 15:51:06 +0000 (16:51 +0100)]
doc/doxy-wrapper.sh: fix execute flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/frame_thread_encoder: warn about huffyuv limitations
Michael Niedermayer [Sat, 15 Feb 2014 14:16:51 +0000 (15:16 +0100)]
avcodec/frame_thread_encoder: warn about huffyuv limitations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/frame_thread_encoder: restructure huffyuv checks
Michael Niedermayer [Sat, 15 Feb 2014 14:14:46 +0000 (15:14 +0100)]
avcodec/frame_thread_encoder: restructure huffyuv checks

This makes them similar to the other checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvenc: only allocate stats_out when it will be used
Michael Niedermayer [Sat, 15 Feb 2014 14:06:29 +0000 (15:06 +0100)]
avcodec/huffyuvenc: only allocate stats_out when it will be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/motion_est: remove unused variable
Lukasz Marek [Fri, 14 Feb 2014 22:20:46 +0000 (23:20 +0100)]
lavc/motion_est: remove unused variable

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_compand: do not leak frames on error
Paul B Mahol [Sat, 15 Feb 2014 11:38:32 +0000 (11:38 +0000)]
avfilter/af_compand: do not leak frames on error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/x86/lossless_videodsp: fix w type
Michael Niedermayer [Sat, 15 Feb 2014 05:36:58 +0000 (06:36 +0100)]
avcodec/x86/lossless_videodsp: fix w type

Fixes fate issues on mingw64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 15 Feb 2014 03:05:04 +0000 (04:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

Conflicts:
libavfilter/buffersink.h
libavfilter/buffersrc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'
Michael Niedermayer [Sat, 15 Feb 2014 02:48:50 +0000 (03:48 +0100)]
Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
  buffersink: document special error codes returned from av_buffersink_get_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8dsp: add VP7 idct and loop filter
Peter Ross [Fri, 14 Feb 2014 11:58:17 +0000 (22:58 +1100)]
avcodec/vp8dsp: add VP7 idct and loop filter

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/ffv1enc: add const to silent warning
Lukasz Marek [Fri, 14 Feb 2014 22:21:20 +0000 (23:21 +0100)]
lavc/ffv1enc: add const to silent warning

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/tiff_common: add const to silent warnings
Lukasz Marek [Fri, 14 Feb 2014 22:13:37 +0000 (23:13 +0100)]
lavc/tiff_common: add const to silent warnings

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED
Peter Ross [Fri, 14 Feb 2014 11:57:43 +0000 (22:57 +1100)]
avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED

Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group
Anton Khirnov [Mon, 10 Feb 2014 16:25:21 +0000 (17:25 +0100)]
lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

6 years agobuffersink: document special error codes returned from av_buffersink_get_frame
Anton Khirnov [Tue, 21 May 2013 18:30:36 +0000 (20:30 +0200)]
buffersink: document special error codes returned from av_buffersink_get_frame

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Feb 2014 20:59:56 +0000 (21:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: reduce overreads when loading 8 pixels in altivec dsp functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'
Michael Niedermayer [Fri, 14 Feb 2014 20:49:52 +0000 (21:49 +0100)]
Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'

* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
  utvideoenc: Enable support for multiple slices and use them

Conflicts:
libavcodec/utvideoenc.c
tests/fate/utvideo.mak

See: efec857c9f70113bdbcc18e03a5bcadcdca9f9a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: Enable support for multiple slices and use them
Jan Ekström [Fri, 14 Feb 2014 12:48:19 +0000 (14:48 +0200)]
utvideoenc: Enable support for multiple slices and use them

The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'
Michael Niedermayer [Fri, 14 Feb 2014 20:36:02 +0000 (21:36 +0100)]
Merge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'

* commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34':
  libx265: Remove redundant default param call

See: 25bc8390bb5013eb6f32dcbc28bb420135f3f1f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '41836c4e306e572ecf80d5a714aaec532c7ece60'
Michael Niedermayer [Fri, 14 Feb 2014 20:21:31 +0000 (21:21 +0100)]
Merge commit '41836c4e306e572ecf80d5a714aaec532c7ece60'

* commit '41836c4e306e572ecf80d5a714aaec532c7ece60':
  libx265: Fix use of uninitialized input picture

See: 955544e4d031bd8435cf8f55bdbfe1d0ede01469
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: skip the MPEG-2 style dts/pts code for HEVC
Michael Niedermayer [Fri, 14 Feb 2014 19:34:53 +0000 (20:34 +0100)]
avformat/utils: skip the MPEG-2 style dts/pts code for HEVC

This extends the exception from H264 to H264 + HEVC

Fixes Ticket3385

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: improve guess_correct_pts() by considerng mixed dts/pts use caused...
Michael Niedermayer [Fri, 14 Feb 2014 19:27:07 +0000 (20:27 +0100)]
avcodec/utils: improve guess_correct_pts() by considerng mixed dts/pts use caused by NOPTSs

No testcase known, this is a theoretical improvment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoppc: reduce overreads when loading 8 pixels in altivec dsp functions
Janne Grunau [Thu, 13 Feb 2014 11:27:17 +0000 (12:27 +0100)]
ppc: reduce overreads when loading 8 pixels in altivec dsp functions

Altivec can only load naturally aligned vectors. To handle possibly
unaligned data a second vector is loaded from an offset of the original
location and the data is recovered through a vector permutation.
Overreads are minimal if the offset for second load points to the last
element of data. This is 7 for loading eight 8-bit pixels and overreads
are reduced from 16 bytes to 8 bytes if the pixels are 64-bit aligned.
For unaligned pixels the overread is reduced from 23 bytes to 15 bytes
in the worst case.

6 years agoMAINTAINERS: add myself as ffserver maintainer
Reynaldo H. Verdejo Pinochet [Fri, 14 Feb 2014 17:30:09 +0000 (14:30 -0300)]
MAINTAINERS: add myself as ffserver maintainer

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: merge RTSP's teardown & pause routines
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 18:03:52 +0000 (15:03 -0300)]
ffserver: merge RTSP's teardown & pause routines

They were basically the same.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: cosmetics
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 07:11:01 +0000 (04:11 -0300)]
ffserver: cosmetics

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: fix some comments
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 07:10:11 +0000 (04:10 -0300)]
ffserver: fix some comments

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: factor out connection closing from handler
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 06:24:16 +0000 (03:24 -0300)]
ffserver: factor out connection closing from handler

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: avoid useless substitution
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 05:37:39 +0000 (02:37 -0300)]
ffserver: avoid useless substitution

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agodoc/filters/histogram: copyedit for grammar
Werner Robitza [Mon, 10 Feb 2014 17:16:36 +0000 (18:16 +0100)]
doc/filters/histogram: copyedit for grammar

There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.

6 years agoutvideoenc: Enable support for multiple slices and use them
Jan Ekström [Fri, 14 Feb 2014 11:48:56 +0000 (12:48 +0100)]
utvideoenc: Enable support for multiple slices and use them

The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Feb 2014 14:31:14 +0000 (15:31 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/examples: misc Doxygen markup improvements

Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx265: Remove redundant default param call
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:24 +0000 (20:49 +0000)]
libx265: Remove redundant default param call

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Fix use of uninitialized input picture
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:05 +0000 (20:49 +0000)]
libx265: Fix use of uninitialized input picture

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'
Michael Niedermayer [Fri, 14 Feb 2014 14:23:29 +0000 (15:23 +0100)]
Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'

* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
  build: doxy: Include code examples in Doxygen documentation

Conflicts:
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '19d3127867f001d007f98bc8c5a85c5409abf788'
Michael Niedermayer [Fri, 14 Feb 2014 14:12:32 +0000 (15:12 +0100)]
Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788'

* commit '19d3127867f001d007f98bc8c5a85c5409abf788':
  doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh

Conflicts:
doc/Doxyfile
doc/doxy-wrapper.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'
Michael Niedermayer [Fri, 14 Feb 2014 13:52:50 +0000 (14:52 +0100)]
Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
doc/Makefile

See: 0f378d86321e4d14153a28d5e74c3ff0f99b1a20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'
Michael Niedermayer [Fri, 14 Feb 2014 13:23:50 +0000 (14:23 +0100)]
Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'

* commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492':
  Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh

Conflicts:
doc/Doxyfile

See: 7d0ca5b7e43676cc23834ccd19d40744f7328b77
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '066ad249843bde656265b59110c2521e2b1ce131'
Michael Niedermayer [Fri, 14 Feb 2014 13:17:35 +0000 (14:17 +0100)]
Merge commit '066ad249843bde656265b59110c2521e2b1ce131'

* commit '066ad249843bde656265b59110c2521e2b1ce131':
  h264_sei: reorder headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '304e916a92bc17385a485bec2f957e192257ddb6'
Michael Niedermayer [Fri, 14 Feb 2014 13:12:28 +0000 (14:12 +0100)]
Merge commit '304e916a92bc17385a485bec2f957e192257ddb6'

* commit '304e916a92bc17385a485bec2f957e192257ddb6':
  h264_sei: name buffering period type consistently

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15210354cf27cf4e24d91f84d66cf471511ce718'
Michael Niedermayer [Fri, 14 Feb 2014 13:06:54 +0000 (14:06 +0100)]
Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718'

* commit '15210354cf27cf4e24d91f84d66cf471511ce718':
  h264: drop outdated comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3a0576702825423abecb32627c530dbc4c0f73bc'
Michael Niedermayer [Fri, 14 Feb 2014 12:58:02 +0000 (13:58 +0100)]
Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'

* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
  h264: store current_sps_id inside the current sps

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

The current_sps_id is not removed as it used in security related code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73e8fab31dc19c4371499e612856accbc00b2820'
Michael Niedermayer [Fri, 14 Feb 2014 12:35:45 +0000 (13:35 +0100)]
Merge commit '73e8fab31dc19c4371499e612856accbc00b2820'

* commit '73e8fab31dc19c4371499e612856accbc00b2820':
  h264: print values in case of error

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c'
Michael Niedermayer [Fri, 14 Feb 2014 12:23:45 +0000 (13:23 +0100)]
Merge commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c'

* commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c':
  h264: Refactor ff_h264_decode_ref_pic_list_reordering

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples: misc Doxygen markup improvements
Diego Biurrun [Tue, 11 Feb 2014 14:49:39 +0000 (15:49 +0100)]
doc/examples: misc Doxygen markup improvements

Add properly formatted @example tag and fix Doxygen syntax.

6 years agobuild: doxy: Include code examples in Doxygen documentation
Diego Biurrun [Tue, 11 Feb 2014 17:38:03 +0000 (18:38 +0100)]
build: doxy: Include code examples in Doxygen documentation

6 years agodoxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh
Diego Biurrun [Tue, 11 Feb 2014 20:31:58 +0000 (21:31 +0100)]
doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh

This allows using the libav source path as the example path.

6 years agobuild: Do not pass HTML snippets and stylesheet as input to Doxygen
Diego Biurrun [Tue, 11 Feb 2014 16:30:43 +0000 (17:30 +0100)]
build: Do not pass HTML snippets and stylesheet as input to Doxygen

These files are referenced elsewhere and only generate warnings if
presented to Doxygen as input files.

6 years agoDoxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh
Diego Biurrun [Tue, 11 Feb 2014 20:39:38 +0000 (21:39 +0100)]
Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh

6 years agolavd/avdevice: add param to create window buffer message
Lukasz Marek [Thu, 13 Feb 2014 23:30:45 +0000 (00:30 +0100)]
lavd/avdevice: add param to create window buffer message

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_sei: reorder headers
Vittorio Giovara [Thu, 13 Feb 2014 09:01:03 +0000 (10:01 +0100)]
h264_sei: reorder headers

Also drop unused assert.h.

6 years agoh264_sei: name buffering period type consistently
Vittorio Giovara [Thu, 13 Feb 2014 01:26:04 +0000 (02:26 +0100)]
h264_sei: name buffering period type consistently

6 years agoh264: drop outdated comments
Vittorio Giovara [Wed, 12 Feb 2014 23:44:11 +0000 (00:44 +0100)]
h264: drop outdated comments

6 years agoh264: store current_sps_id inside the current sps
Vittorio Giovara [Wed, 12 Feb 2014 23:43:17 +0000 (00:43 +0100)]
h264: store current_sps_id inside the current sps

In preparation for MVC support.

6 years agoh264: print values in case of error
Vittorio Giovara [Wed, 12 Feb 2014 23:30:12 +0000 (00:30 +0100)]
h264: print values in case of error

Also make error style consistent and drop redundant information.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Feb 2014 03:06:57 +0000 (04:06 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg12dec: do not add stereo3D side data to a non-existing frame

Conflicts:
libavcodec/mpeg12dec.c

See: fe285b04bbad23ddfac164e22034b5ee76e039a6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd261719319a505e1716e8b52fc955bef0503ff96'
Michael Niedermayer [Fri, 14 Feb 2014 01:35:36 +0000 (02:35 +0100)]
Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96'

* commit 'd261719319a505e1716e8b52fc955bef0503ff96':
  configure: do not link libraries against program-specific dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'
Michael Niedermayer [Fri, 14 Feb 2014 01:06:41 +0000 (02:06 +0100)]
Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'

* commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8':
  configure: avserver does not need $ldl

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'
Michael Niedermayer [Fri, 14 Feb 2014 00:47:06 +0000 (01:47 +0100)]
Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'

* commit '8a2250344b19a343d830a902dbcf4c0b929ea49b':
  jv: detect partial packets in the demuxer

Conflicts:
libavformat/jvdec.c

See: 9d0c71e5e34dec2c6246bf47da8d9674c92f85c1
See: b948ab8132e24d215072120e210139dc456d4997
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'
Michael Niedermayer [Fri, 14 Feb 2014 00:24:20 +0000 (01:24 +0100)]
Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1'

* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Thu, 13 Feb 2014 23:02:27 +0000 (00:02 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/opengl_enc: implement uncoded frame callback
  lavd/opengl_enc: add gray8/16 formats

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpegts: DVB subtitles multiple languages support
mrlika [Mon, 3 Feb 2014 12:11:07 +0000 (14:11 +0200)]
avformat/mpegts: DVB subtitles multiple languages support

Copy multiple languages data from PMT to extradata. New 5 bytes
per language extradata format.

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Refactor ff_h264_decode_ref_pic_list_reordering
Luca Barbato [Thu, 13 Feb 2014 14:31:57 +0000 (15:31 +0100)]
h264: Refactor ff_h264_decode_ref_pic_list_reordering

In preparation for MVC support.

6 years agolavd/opengl_enc: implement uncoded frame callback
Lukasz Marek [Tue, 4 Feb 2014 23:30:38 +0000 (00:30 +0100)]
lavd/opengl_enc: implement uncoded frame callback

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc: add gray8/16 formats
Lukasz Marek [Sat, 8 Feb 2014 02:39:34 +0000 (03:39 +0100)]
lavd/opengl_enc: add gray8/16 formats

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoMAINTANERS: Add myself as libx265 maintainer
Derek Buitenhuis [Thu, 13 Feb 2014 22:22:56 +0000 (22:22 +0000)]
MAINTANERS: Add myself as libx265 maintainer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Remove redundant default param call
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:24 +0000 (20:49 +0000)]
libx265: Remove redundant default param call

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Fix use of uninitialized input picture
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:05 +0000 (20:49 +0000)]
libx265: Fix use of uninitialized input picture

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoflac/x86: add ff_flac_lpc_32_xop()
James Almer [Sat, 8 Feb 2014 05:54:51 +0000 (02:54 -0300)]
flac/x86: add ff_flac_lpc_32_xop()

Tested on an AMD FX 6300

679081 decicycles in ff_flac_lpc_32_xop, 32768 runs
774425 decicycles in ff_flac_lpc_32_sse4, 32768 runs

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86inc: Extend FMA_INSTR functionality
James Almer [Sat, 8 Feb 2014 05:54:50 +0000 (02:54 -0300)]
x86inc: Extend FMA_INSTR functionality

Support the cases where the first and last operand of
the XOP instruction are the same.

Also add vpmacsdql emulation.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: fix flac encoder and decoder dependencies
James Darnley [Tue, 11 Feb 2014 22:49:39 +0000 (23:49 +0100)]
lavc: fix flac encoder and decoder dependencies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/curves: support slice threading.
Clément Bœsch [Thu, 13 Feb 2014 13:34:58 +0000 (14:34 +0100)]
avfilter/curves: support slice threading.

6 years agoavformat/mpegtsenc: Check data array size in mpegts_write_pmt()
Michael Niedermayer [Thu, 13 Feb 2014 12:59:51 +0000 (13:59 +0100)]
avformat/mpegtsenc: Check data array size in mpegts_write_pmt()

Prevents out of array writes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts muxer: DVB subtitles multiple languages support
mrlika [Thu, 13 Feb 2014 00:00:24 +0000 (02:00 +0200)]
mpegts muxer: DVB subtitles multiple languages support

* restore multiple languages data from extradata to PMT table
* setting correctly hearing empaired subtitling type

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/lut3d: support slice threading.
Clément Bœsch [Thu, 13 Feb 2014 12:37:32 +0000 (13:37 +0100)]
avfilter/lut3d: support slice threading.

6 years agompeg12dec: do not add stereo3D side data to a non-existing frame
Janne Grunau [Thu, 13 Feb 2014 09:39:08 +0000 (10:39 +0100)]
mpeg12dec: do not add stereo3D side data to a non-existing frame

User data is usually coded before slice data. That means the frame
the user data belongs to is not available while parsing the user data.
The stereo3D side data has to use the same indirection over the private
context as pan scan information and A53 captions.

Bug-Id:632

6 years agoconfigure: do not link libraries against program-specific dependencies
Janne Grunau [Wed, 12 Feb 2014 23:44:08 +0000 (00:44 +0100)]
configure: do not link libraries against program-specific dependencies

Bug-Id: 635

6 years agoavcodec/arm/int_neon: fix handling sizes % 16 != 0
Michael Niedermayer [Thu, 13 Feb 2014 01:20:08 +0000 (02:20 +0100)]
avcodec/arm/int_neon: fix handling sizes % 16 != 0

This assumes the array is sufficiently padded with 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotta: split off hybrid filter processing as ttadsp
James Almer [Wed, 12 Feb 2014 17:03:07 +0000 (14:03 -0300)]
tta: split off hybrid filter processing as ttadsp

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/uncoded_frame: fix double free
Lukasz Marek [Wed, 12 Feb 2014 20:16:16 +0000 (21:16 +0100)]
tools/uncoded_frame: fix double free

in case av_interleaved_write_uncoded_frame fails it seems
frame is freed for the second time in fail section.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
This commit also removes 1 trailing whitespace as otherwise the push hook rejects it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Feb 2014 23:41:06 +0000 (00:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: add a new segmentation sample.

Conflicts:
tests/fate/vpx.mak
tests/ref/fate/vp9-segmentation-aq-akiyo
tests/ref/fate/vp9-segmentation-sf-akiyo

See: 65f41b5c5cdb22e60a83321fe564ebb0155a35ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '91be8df20b57a18307e90f1c4886a35ea7b28880'
Michael Niedermayer [Wed, 12 Feb 2014 23:32:00 +0000 (00:32 +0100)]
Merge commit '91be8df20b57a18307e90f1c4886a35ea7b28880'

* commit '91be8df20b57a18307e90f1c4886a35ea7b28880':
  vp9: add fate sample for parallelmode.

Conflicts:
tests/fate/vpx.mak
tests/ref/fate/vp9-parallelmode-akiyo

See: 1d6bb21348711a05f25123b9aad065a08e1e5b58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: avserver does not need $ldl
Janne Grunau [Wed, 12 Feb 2014 23:29:14 +0000 (00:29 +0100)]
configure: avserver does not need $ldl

Loadable plugins were removed in d010e95f86089abe9a3d4d4a66ac8102312d28a4.

6 years agoMerge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
Michael Niedermayer [Wed, 12 Feb 2014 23:12:03 +0000 (00:12 +0100)]
Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'

* commit '50ea93158d4c480f64069e8bd1da388486dcf4ba':
  Add libx265 encoder

Conflicts:
Changelog
LICENSE
configure
libavcodec/allcodecs.c
libavcodec/libx265.c
libavcodec/version.h

See: bb6b1731eba2fac424ff8ad3003fe58b308debd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojv: detect partial packets in the demuxer
Janne Grunau [Wed, 12 Feb 2014 19:08:52 +0000 (20:08 +0100)]
jv: detect partial packets in the demuxer

Fixes fate-jv under valgrind which reports a different CRC for the last
frame from a partial read.

6 years agoavformat/asfdec: pass on error code from avio_seek()
Michael Niedermayer [Wed, 12 Feb 2014 16:10:26 +0000 (17:10 +0100)]
avformat/asfdec: pass on error code from avio_seek()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Feb 2014 15:36:04 +0000 (16:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  asfdec: fix seeking with fragmented packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'
Michael Niedermayer [Wed, 12 Feb 2014 15:16:16 +0000 (16:16 +0100)]
Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'

* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
  asfdec: short-circuit seeking to the start of stream

Conflicts:
libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0ebb523f072322972ea446616676fff32e9603c6'
Michael Niedermayer [Wed, 12 Feb 2014 15:00:37 +0000 (16:00 +0100)]
Merge commit '0ebb523f072322972ea446616676fff32e9603c6'

* commit '0ebb523f072322972ea446616676fff32e9603c6':
  asfdec: check ff_get_guid() return values during seeking

Conflicts:
libavformat/asfdec.c

The code that pretends that a truncated index is correct and complete is not merged
as it obviously would cause problems if a really truncated index is encountered
If someone has samples that work better with that hack, please share them / mail me

also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riff: return error code from ff_get_guid()
Michael Niedermayer [Wed, 12 Feb 2014 14:51:38 +0000 (15:51 +0100)]
avformat/riff: return error code from ff_get_guid()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: make context_count unsigned
Janne Grunau [Wed, 12 Feb 2014 11:47:27 +0000 (12:47 +0100)]
h264: make context_count unsigned

Removes the bogus but scary looking warning 'libavcodec/h264.c:4529:49:
warning: array subscript is below array bounds [-Warray-bounds]'.

6 years agovp9: add a new segmentation sample.
Ronald S. Bultje [Thu, 6 Feb 2014 22:52:18 +0000 (23:52 +0100)]
vp9: add a new segmentation sample.

The old one didn't use segmentation. One uses segmentation in all frame
types (--aq-mode=1), and the other uses all segmentation features, but
only in inter frames (mbgraph).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agovp9: add fate sample for parallelmode.
Ronald S. Bultje [Thu, 6 Feb 2014 22:52:17 +0000 (23:52 +0100)]
vp9: add fate sample for parallelmode.

This disables backward probability updates, which makes the codec more
friendly for frame-level multi-threading.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoMerge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
Michael Niedermayer [Wed, 12 Feb 2014 13:59:00 +0000 (14:59 +0100)]
Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'

* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
  aacdec: set AVFrame sample_rate

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a7d3837b4dd17fff270b55166597c093204e542'
Michael Niedermayer [Wed, 12 Feb 2014 13:49:13 +0000 (14:49 +0100)]
Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'

* commit '4a7d3837b4dd17fff270b55166597c093204e542':
  buffersrc: Have function parameter names match between .c and .h file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'
Michael Niedermayer [Wed, 12 Feb 2014 13:41:24 +0000 (14:41 +0100)]
Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'

* commit '25a1ba814ad80056247fd357ec4c6911324a3f66':
  log: Have function parameter names match between .c and .h file

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd libx265 encoder
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:26 +0000 (14:46 +0000)]
Add libx265 encoder

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoAdd libx265 encoder
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:26 +0000 (14:46 +0000)]
Add libx265 encoder

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoasfdec: fix seeking with fragmented packets
Janne Grunau [Tue, 11 Feb 2014 12:01:38 +0000 (13:01 +0100)]
asfdec: fix seeking with fragmented packets

After seeking fragments with an offset > 0 must be skipped to correctly
assemble packets.

Bug-Id: 43

6 years agoasfdec: short-circuit seeking to the start of stream
Andrew Kelley [Sun, 2 Feb 2014 23:05:58 +0000 (23:05 +0000)]
asfdec: short-circuit seeking to the start of stream

Bug-id: 43

Signed-off-by: Janne Grunau <janne-libav@jannau.net>