ffmpeg.git
6 years agoMerge commit '25b32586566f285d797737863c97a1c5c9c84e2b'
Michael Niedermayer [Mon, 24 Mar 2014 12:41:49 +0000 (13:41 +0100)]
Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
Michael Niedermayer [Mon, 24 Mar 2014 12:27:33 +0000 (13:27 +0100)]
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 05:07:28 +0000 (06:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Remove dcbzl check for e500v1 and e500v2 architectures

See: d5733936d857ce5c7d28c0bc9e89a2e2548f8895
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: add an AVStream field for exporting stream-global side data
Anton Khirnov [Wed, 19 Feb 2014 11:10:32 +0000 (12:10 +0100)]
lavf: add an AVStream field for exporting stream-global side data

6 years agolavc: give a typedeffed name to the AVPacket.side_data struct
Anton Khirnov [Wed, 19 Feb 2014 11:00:03 +0000 (12:00 +0100)]
lavc: give a typedeffed name to the AVPacket.side_data struct

6 years agoMerge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'
Michael Niedermayer [Mon, 24 Mar 2014 04:28:07 +0000 (05:28 +0100)]
Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/swscale: fix integer overflow
Michael Niedermayer [Mon, 24 Mar 2014 04:01:32 +0000 (05:01 +0100)]
swscale/swscale: fix integer overflow

Should fix fate failure with clang ftrapv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add tests for linearly interpolated resampling
Michael Niedermayer [Mon, 24 Mar 2014 03:25:44 +0000 (04:25 +0100)]
fate: add tests for linearly interpolated resampling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/tiny_psnr: Print information about the supported sample types in the help and...
Michael Niedermayer [Mon, 24 Mar 2014 03:00:21 +0000 (04:00 +0100)]
tests/tiny_psnr: Print information about the supported sample types in the help and error texts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample/resample: sse float linear interpolation
James Almer [Sun, 23 Mar 2014 22:05:17 +0000 (19:05 -0300)]
swresample/resample: sse float linear interpolation

About two times faster

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample/resample: mmx2/sse2 int16 linear interpolation
James Almer [Sun, 23 Mar 2014 22:05:16 +0000 (19:05 -0300)]
swresample/resample: mmx2/sse2 int16 linear interpolation

About three times faster

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Remove dcbzl check for e500v1 and e500v2 architectures
Peter Krefting [Thu, 6 Feb 2014 12:51:39 +0000 (12:51 +0000)]
configure: Remove dcbzl check for e500v1 and e500v2 architectures

The DCBZL instruction is not available for the e500v1 and e500v2
architectures, but may still be recognized by the toolchain, so we
need to explicitly disable it for these architectures.

References: PowerPC™ e500 Core Family Reference Manual (Freescale)

Found-by: Ståle Kristoffersen <staalebk@ifi.uio.no>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agompeg: K&R formatting cosmetics
Tanja Batchelor [Thu, 20 Mar 2014 01:02:42 +0000 (01:02 +0000)]
mpeg: K&R formatting cosmetics

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 00:24:55 +0000 (01:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Split h264 slice decoding from nal decoding

Conflicts:
libavcodec/Makefile
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'
Michael Niedermayer [Sun, 23 Mar 2014 23:46:20 +0000 (00:46 +0100)]
Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'

* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0':
  h264: move macroblock decoding into its own file

Conflicts:
libavcodec/Makefile
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'
Michael Niedermayer [Sun, 23 Mar 2014 23:26:46 +0000 (00:26 +0100)]
Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'

* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4':
  build: Sort h264 objects

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'
Michael Niedermayer [Sun, 23 Mar 2014 23:20:56 +0000 (00:20 +0100)]
Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'

* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
  build: h264 parser depends on full h264 decoder

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 23 Mar 2014 23:04:56 +0000 (00:04 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavu: add myself as dynarray.h maintainer.
  ffmpeg: sub2video: send a last blank frame before closing.
  tools: add dvd2concat.
  lavf/concatdec: allow to match streams by id.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Split h264 slice decoding from nal decoding
Luca Barbato [Wed, 19 Mar 2014 15:52:47 +0000 (16:52 +0100)]
h264: Split h264 slice decoding from nal decoding

6 years agoh264: move macroblock decoding into its own file
Vittorio Giovara [Wed, 19 Mar 2014 15:47:12 +0000 (16:47 +0100)]
h264: move macroblock decoding into its own file

6 years agobuild: Sort h264 objects
Luca Barbato [Fri, 28 Feb 2014 15:37:46 +0000 (15:37 +0000)]
build: Sort h264 objects

6 years agobuild: h264 parser depends on full h264 decoder
Luca Barbato [Wed, 19 Mar 2014 15:41:08 +0000 (16:41 +0100)]
build: h264 parser depends on full h264 decoder

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 23 Mar 2014 18:43:51 +0000 (19:43 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  RELEASE_NOTES: mention new filters

Conflicts:
doc/RELEASE_NOTES

Not merged as these things where in past ffmpeg releases already.
Or at least some of them where, volunteers to checks this and update
our release notes are welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: add myself as dynarray.h maintainer.
Nicolas George [Sun, 23 Mar 2014 18:17:20 +0000 (19:17 +0100)]
lavu: add myself as dynarray.h maintainer.

6 years agoffmpeg: sub2video: send a last blank frame before closing.
Nicolas George [Sun, 2 Mar 2014 19:59:32 +0000 (20:59 +0100)]
ffmpeg: sub2video: send a last blank frame before closing.

Fix trac ticket #3420.

6 years agotools: add dvd2concat.
Nicolas George [Sun, 2 Mar 2014 14:17:47 +0000 (15:17 +0100)]
tools: add dvd2concat.

6 years agolavf/concatdec: allow to match streams by id.
Nicolas George [Wed, 26 Feb 2014 19:22:46 +0000 (20:22 +0100)]
lavf/concatdec: allow to match streams by id.

That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.

6 years agoAlways pass the configure option sysroot to --sysroot and -isysroot.
Carl Eugen Hoyos [Sun, 23 Mar 2014 16:57:32 +0000 (17:57 +0100)]
Always pass the configure option sysroot to --sysroot and -isysroot.

On darwin, --sysroot may be ignored.

6 years agoAutodetect VDA like all other hardware acccelerations.
Carl Eugen Hoyos [Sun, 23 Mar 2014 12:24:07 +0000 (13:24 +0100)]
Autodetect VDA like all other hardware acccelerations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRELEASE_NOTES: mention new filters
Vittorio Giovara [Sun, 23 Mar 2014 16:28:34 +0000 (17:28 +0100)]
RELEASE_NOTES: mention new filters

6 years agoavcodec/x86/h264_qpel: Fix typo introduced by 322a1dda973e802db7b57f2007fad3efcd5bab81
Michael Niedermayer [Sun, 23 Mar 2014 14:03:50 +0000 (15:03 +0100)]
avcodec/x86/h264_qpel: Fix typo introduced by 322a1dda973e802db7b57f2007fad3efcd5bab81

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMove avpriv_find_pix_fmt() to utils.c
Michael Niedermayer [Sun, 23 Mar 2014 12:25:42 +0000 (13:25 +0100)]
Move avpriv_find_pix_fmt() to utils.c

Fixes build with --disable-everything

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: restructure http_connect error handling path
wm4 [Fri, 21 Mar 2014 17:51:31 +0000 (18:51 +0100)]
http: restructure http_connect error handling path

The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'
Michael Niedermayer [Sun, 23 Mar 2014 02:46:16 +0000 (03:46 +0100)]
Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'

* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
  changelog: switch libx265 and compand entries

Conflicts:
Changelog

Not many changes as libx265 and compand are placed correctly for us

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'
Michael Niedermayer [Sun, 23 Mar 2014 02:32:00 +0000 (03:32 +0100)]
Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'

* commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'
Michael Niedermayer [Sun, 23 Mar 2014 02:22:20 +0000 (03:22 +0100)]
Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'

* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: drop ff_pixfmt_list_420
Vittorio Giovara [Mon, 17 Mar 2014 17:03:47 +0000 (18:03 +0100)]
lavc: drop ff_pixfmt_list_420

6 years agochangelog: switch libx265 and compand entries
Vittorio Giovara [Fri, 21 Mar 2014 01:14:26 +0000 (02:14 +0100)]
changelog: switch libx265 and compand entries

6 years agoconfigure: Always use -DOPJ_STATIC when checking for openjpeg
Luca Barbato [Sat, 22 Mar 2014 19:16:44 +0000 (20:16 +0100)]
configure: Always use -DOPJ_STATIC when checking for openjpeg

Unbreaks windows systems not providing pkgconf files.

Reported-By: Rafaël Carré <funman@videolan.org>
6 years agomovenc: Allow override of major brand in ftyp atom
John Stebbins [Tue, 18 Mar 2014 13:11:00 +0000 (13:11 +0000)]
movenc: Allow override of major brand in ftyp atom

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
6 years agoavcodec: Add padding after the remaining AVFrames
Michael Niedermayer [Mon, 17 Mar 2014 23:08:54 +0000 (00:08 +0100)]
avcodec: Add padding after the remaining AVFrames

This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded

A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 22 Mar 2014 22:50:45 +0000 (23:50 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: fix teletext pts of streams with standalone pcr pid
  mpegts: add pcr filter for tracking standalone pcr pids
  mpegts: factorize mpegts filter creator code
  mpegts: move last_pcr to MpegTSFilter level

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lagarith: Fix typo in printf format string

Conflicts:
libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
Michael Niedermayer [Sat, 22 Mar 2014 22:26:23 +0000 (23:26 +0100)]
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'

* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
Michael Niedermayer [Sat, 22 Mar 2014 22:21:54 +0000 (23:21 +0100)]
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
  x86: dsputil: Move hpeldsp-related declarations to a separate header

Conflicts:
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'
Michael Niedermayer [Sat, 22 Mar 2014 22:16:41 +0000 (23:16 +0100)]
Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
  ppc: dsputil: Move hpeldsp-related declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
Michael Niedermayer [Sat, 22 Mar 2014 22:02:46 +0000 (23:02 +0100)]
Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
Michael Niedermayer [Sat, 22 Mar 2014 21:30:20 +0000 (22:30 +0100)]
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'

* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
Michael Niedermayer [Sat, 22 Mar 2014 21:23:04 +0000 (22:23 +0100)]
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'

* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '600b854ad8173995518bd917e7f86120b5505088'
Michael Niedermayer [Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)]
Merge commit '600b854ad8173995518bd917e7f86120b5505088'

* commit '600b854ad8173995518bd917e7f86120b5505088':
  imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
Michael Niedermayer [Sat, 22 Mar 2014 21:11:17 +0000 (22:11 +0100)]
Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
  x86: dsputil: Move inline assembly macros to a separate header

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
Michael Niedermayer [Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)]
Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD
Michael Niedermayer [Sat, 22 Mar 2014 20:47:38 +0000 (21:47 +0100)]
avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/mem: avoid using intptr_t to access void* in av_dynarray_add()
Michael Niedermayer [Sat, 22 Mar 2014 20:14:57 +0000 (21:14 +0100)]
avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/mem: reimplement the dynarray functions with the macro.
Nicolas George [Sat, 8 Mar 2014 20:27:00 +0000 (21:27 +0100)]
lavu/mem: reimplement the dynarray functions with the macro.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: add AV_DYNARRAY_ADD() macro.
Nicolas George [Sat, 8 Mar 2014 20:26:59 +0000 (21:26 +0100)]
lavu: add AV_DYNARRAY_ADD() macro.

Signed-off-by: Nicolas George <george@nsup.org>
Reviewed-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Mar 2014 17:52:21 +0000 (18:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: Replace arch optimization ifdefs by if cascade

Conflicts:
libavutil/float_dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
Michael Niedermayer [Sat, 22 Mar 2014 17:43:40 +0000 (18:43 +0100)]
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'

* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
  avcodec: more correct printf specifiers

Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolagarith: Fix typo in printf format string
Diego Biurrun [Sat, 22 Mar 2014 17:36:33 +0000 (18:36 +0100)]
lagarith: Fix typo in printf format string

libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]

6 years agoMerge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
Michael Niedermayer [Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)]
Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add cine demux test
Peter Ross [Fri, 21 Mar 2014 04:12:22 +0000 (15:12 +1100)]
fate: add cine demux test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: make snow non experimental
Michael Niedermayer [Thu, 13 Mar 2014 17:16:21 +0000 (18:16 +0100)]
avcodec/snowenc: make snow non experimental

After this commit the created bitstream will be supported by future
decoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: try to clarify verbiage on buffer_size
rogerdpack [Fri, 21 Mar 2014 23:53:19 +0000 (17:53 -0600)]
udp: try to clarify verbiage on buffer_size

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unabl...
rogerdpack [Fri, 21 Mar 2014 23:37:42 +0000 (17:37 -0600)]
avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough

which can happen easily in linux

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: Move thirdpel-related bits into their own context
Diego Biurrun [Sat, 21 Dec 2013 15:03:59 +0000 (16:03 +0100)]
dsputil: Move thirdpel-related bits into their own context

6 years agox86: dsputil: Move hpeldsp-related declarations to a separate header
Diego Biurrun [Wed, 29 Jan 2014 13:57:10 +0000 (14:57 +0100)]
x86: dsputil: Move hpeldsp-related declarations to a separate header

6 years agoppc: dsputil: Move hpeldsp-related declarations to a separate header
Diego Biurrun [Thu, 30 Jan 2014 00:06:28 +0000 (16:06 -0800)]
ppc: dsputil: Move hpeldsp-related declarations to a separate header

6 years agox86: dsputil: Move fpel declarations to a separate header
Diego Biurrun [Tue, 28 Jan 2014 17:19:21 +0000 (18:19 +0100)]
x86: dsputil: Move fpel declarations to a separate header

6 years agodsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Diego Biurrun [Sat, 21 Dec 2013 16:33:17 +0000 (17:33 +0100)]
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

6 years agodsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Diego Biurrun [Sun, 22 Dec 2013 15:25:24 +0000 (16:25 +0100)]
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

6 years agoimgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Diego Biurrun [Mon, 27 Jan 2014 13:27:04 +0000 (14:27 +0100)]
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

6 years agox86: dsputil: Move inline assembly macros to a separate header
Diego Biurrun [Mon, 27 Jan 2014 14:06:54 +0000 (15:06 +0100)]
x86: dsputil: Move inline assembly macros to a separate header

6 years agonuv: Reuse the DSPContext from RTJpegContext
Diego Biurrun [Wed, 29 Jan 2014 17:04:55 +0000 (18:04 +0100)]
nuv: Reuse the DSPContext from RTJpegContext

There is no point in populating NuvContext with another DSPContext.

Also split static and dynamic initialization bits to avoid running the
static initialization parts over and over.

6 years agofloat_dsp: Replace arch optimization ifdefs by if cascade
Diego Biurrun [Thu, 20 Mar 2014 13:16:25 +0000 (14:16 +0100)]
float_dsp: Replace arch optimization ifdefs by if cascade

Arch-specific optimizations are handled this way everywhere else.

6 years agoavcodec: more correct printf specifiers
Diego Biurrun [Thu, 13 Mar 2014 11:13:33 +0000 (12:13 +0100)]
avcodec: more correct printf specifiers

6 years agoAdditional icl inline asm fix.
Matt Oliver [Sat, 22 Mar 2014 04:59:12 +0000 (15:59 +1100)]
Additional icl inline asm fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: fix teletext pts of streams with standalone pcr pid
Marton Balint [Sun, 2 Mar 2014 14:20:43 +0000 (15:20 +0100)]
mpegts: fix teletext pts of streams with standalone pcr pid

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: add pcr filter for tracking standalone pcr pids
Marton Balint [Sun, 2 Mar 2014 00:47:17 +0000 (01:47 +0100)]
mpegts: add pcr filter for tracking standalone pcr pids

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: factorize mpegts filter creator code
Marton Balint [Sun, 2 Mar 2014 13:28:06 +0000 (14:28 +0100)]
mpegts: factorize mpegts filter creator code

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompegts: move last_pcr to MpegTSFilter level
Marton Balint [Sun, 2 Mar 2014 13:12:50 +0000 (14:12 +0100)]
mpegts: move last_pcr to MpegTSFilter level

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoavfilter: more correct printf format specifiers
Diego Biurrun [Wed, 12 Mar 2014 12:47:33 +0000 (13:47 +0100)]
avfilter: more correct printf format specifiers

6 years agolavc/libx264: add a warning when using qscale
James Darnley [Sat, 22 Mar 2014 08:48:52 +0000 (09:48 +0100)]
lavc/libx264: add a warning when using qscale

This addresses ticket #3238.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: use distinct buffers per stream.
rogerdpack [Fri, 21 Mar 2014 22:27:01 +0000 (16:27 -0600)]
dshow: use distinct buffers per stream.

Basically sometimes if you start dropping video packets, you also drop audio packets. Now they each have separate buffers to avoid this unexpected behavior.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoelbg: change utility_inc to 64bit
Michael Niedermayer [Sat, 22 Mar 2014 02:12:18 +0000 (03:12 +0100)]
elbg: change utility_inc to 64bit

Fixes integer overflow
Fixes Ticket3462

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mp3enc: use av_copy_packet()
Michael Niedermayer [Sat, 22 Mar 2014 00:26:48 +0000 (01:26 +0100)]
avformat/mp3enc: use av_copy_packet()

Fixes double free
Fixes Ticket3476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: also print qbias and mvscale in debug output
Michael Niedermayer [Fri, 21 Mar 2014 20:04:02 +0000 (21:04 +0100)]
avcodec/snowdec: also print qbias and mvscale in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: forward error codes
Michael Niedermayer [Fri, 21 Mar 2014 20:02:02 +0000 (21:02 +0100)]
avcodec/snowdec: forward error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: return more specific error codes
Michael Niedermayer [Fri, 21 Mar 2014 20:01:34 +0000 (21:01 +0100)]
avcodec/snowdec: return more specific error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: simplify spatial_decomposition_count seting code
Michael Niedermayer [Fri, 21 Mar 2014 19:58:33 +0000 (20:58 +0100)]
avcodec/snowenc: simplify spatial_decomposition_count seting code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: never send 'Cookie: (null)' to the server
wm4 [Fri, 21 Mar 2014 17:51:30 +0000 (18:51 +0100)]
http: never send 'Cookie: (null)' to the server

If a domain has some cookies set, but matching the cookie fails due to
the port being different, get_cookies() succeeds, but sets cookies to
NULL. The caller of get_cookies() didn't check for the NULL value.

This also avoids passing NULL to libc string functions, which is
undefined behavior

Fixes Ticket2180

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: allow larger mb variances
Michael Niedermayer [Fri, 21 Mar 2014 17:29:16 +0000 (18:29 +0100)]
avcodec/snowenc: allow larger mb variances

Fixes assertion failure
Fixes Ticket3463

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:25:36 +0000 (18:25 +0100)]
avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit

This avoids hypothetical integer overflows

6 years agoavcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:24:56 +0000 (18:24 +0100)]
avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit

This avoids a hypothetical integer overflow with very high resolution video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:12:58 +0000 (18:12 +0100)]
avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit

This avoids a hypothetical integer overflow with very high resolution video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Try to fix detection of ARM Compiler 5.04
Michael Niedermayer [Fri, 21 Mar 2014 16:51:16 +0000 (17:51 +0100)]
configure: Try to fix detection of ARM Compiler 5.04

Fixes Ticket 3364

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: dont call exit_program() from a signal hander
Michael Niedermayer [Fri, 21 Mar 2014 14:45:03 +0000 (15:45 +0100)]
ffmpeg: dont call exit_program() from a signal hander

This is unsafe and can deadlock amongth other things

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is...
Anshul Maheshwari [Fri, 21 Mar 2014 10:29:52 +0000 (15:59 +0530)]
doc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is AV_PICTURE_TYPE_I

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/snowdsp: add missing clobbers to inner_add_yblock_bw_8_obmc_16_bh_even_ss...
Michael Niedermayer [Fri, 21 Mar 2014 02:20:56 +0000 (03:20 +0100)]
avcodec/x86/snowdsp: add missing clobbers to inner_add_yblock_bw_8_obmc_16_bh_even_sse2() and inner_add_yblock_bw_16_obmc_32_sse2()

Note, these functions are currently disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: provide information about the wavelet with -debug 1
Michael Niedermayer [Fri, 21 Mar 2014 01:44:54 +0000 (02:44 +0100)]
avcodec/snowdec: provide information about the wavelet with -debug 1

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