ffmpeg.git
6 years agoMerge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'
Michael Niedermayer [Wed, 26 Mar 2014 14:53:33 +0000 (15:53 +0100)]
Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'

* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6':
  hpeldsp_template: Move content to hpeldsp

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'
Michael Niedermayer [Wed, 26 Mar 2014 14:40:50 +0000 (15:40 +0100)]
Merge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'

* commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75':
  hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '92ba965103d3884609730ba9bf293772dc78a9ef'
Michael Niedermayer [Wed, 26 Mar 2014 14:36:27 +0000 (15:36 +0100)]
Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'

* commit '92ba965103d3884609730ba9bf293772dc78a9ef':
  dsputil: Move draw_edges and clear_block* out of dsputil_template

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
Michael Niedermayer [Wed, 26 Mar 2014 14:24:50 +0000 (15:24 +0100)]
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'

* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
  dsputil: Move RV40-specific bits into rv40dsp

Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'
Michael Niedermayer [Wed, 26 Mar 2014 14:08:46 +0000 (15:08 +0100)]
Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'

* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
  hpeldsp_template: Detemplatize the code

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2c01ad8b206d326700974438f7193f22be416eb1'
Michael Niedermayer [Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)]
Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'

* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
Michael Niedermayer [Wed, 26 Mar 2014 13:50:47 +0000 (14:50 +0100)]
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'

* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
  Add missing headers to make template files compile (more) standalone

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

* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
  dsputil_template: Move bits that are used templatized into separate file

Conflicts:
libavcodec/dsputil_template.c

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

* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'
Michael Niedermayer [Wed, 26 Mar 2014 13:16:44 +0000 (14:16 +0100)]
Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'

* commit 'd0aabeab23755ee906440505ad2097c0f1493e80':
  x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

See: c8246d37664af9feb23edede944846687aea787a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohpeldsp_template: Move content to hpeldsp
Diego Biurrun [Fri, 10 Jan 2014 14:01:04 +0000 (15:01 +0100)]
hpeldsp_template: Move content to hpeldsp

There is no point in having this separate; it is not used as a template.

6 years agohpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions
Diego Biurrun [Fri, 10 Jan 2014 15:37:23 +0000 (16:37 +0100)]
hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions

6 years agodsputil: Move draw_edges and clear_block* out of dsputil_template
Diego Biurrun [Tue, 7 Jan 2014 23:43:09 +0000 (00:43 +0100)]
dsputil: Move draw_edges and clear_block* out of dsputil_template

The functions are not used templatized.

6 years agodsputil: Move RV40-specific bits into rv40dsp
Diego Biurrun [Wed, 18 Dec 2013 22:27:35 +0000 (23:27 +0100)]
dsputil: Move RV40-specific bits into rv40dsp

6 years agohpeldsp_template: Detemplatize the code
Diego Biurrun [Fri, 10 Jan 2014 13:57:59 +0000 (14:57 +0100)]
hpeldsp_template: Detemplatize the code

The indirection makes no sense without multiple instantiation.

6 years agodsputil_template: Detemplatize the code
Diego Biurrun [Thu, 9 Jan 2014 11:09:35 +0000 (12:09 +0100)]
dsputil_template: Detemplatize the code

The indirection makes no sense without multiple instantiation.

6 years agoAdd missing headers to make template files compile (more) standalone
Diego Biurrun [Thu, 9 Jan 2014 09:27:20 +0000 (10:27 +0100)]
Add missing headers to make template files compile (more) standalone

6 years agodsputil_template: Move bits that are used templatized into separate file
Diego Biurrun [Wed, 8 Jan 2014 23:56:33 +0000 (00:56 +0100)]
dsputil_template: Move bits that are used templatized into separate file

This allows detemplatizing the bits that are not instantiated twice.

6 years agodsputil: Move hpel_template #include out of dsputil_template
Diego Biurrun [Tue, 7 Jan 2014 23:06:52 +0000 (00:06 +0100)]
dsputil: Move hpel_template #include out of dsputil_template

Multiple inclusion makes no sense as it is only used in the 8-bit case.

6 years agox86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation
Diego Biurrun [Wed, 26 Mar 2014 10:58:58 +0000 (11:58 +0100)]
x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

This fixes FATE with mmxext CPUFLAGS set.

6 years agoavcodec/h261: move b_stride/b_xy under the if() where they are used
Michael Niedermayer [Wed, 26 Mar 2014 02:36:24 +0000 (03:36 +0100)]
avcodec/h261: move b_stride/b_xy under the if() where they are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: Export picture type
Michael Niedermayer [Wed, 26 Mar 2014 01:48:12 +0000 (02:48 +0100)]
avcodec/hevc: Export picture type

This only uses the first slice, improvement here is welcome
analyzing all slices the trivial way would interfere with threads

Fixes Ticket3185

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h261dec: fix motion vector vissualization
Michael Niedermayer [Tue, 25 Mar 2014 23:39:46 +0000 (00:39 +0100)]
avcodec/h261dec: fix motion vector vissualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 25 Mar 2014 18:38:43 +0000 (19:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add missing includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
Michael Niedermayer [Tue, 25 Mar 2014 18:24:40 +0000 (19:24 +0100)]
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'
Michael Niedermayer [Tue, 25 Mar 2014 18:17:38 +0000 (19:17 +0100)]
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/cpu: check for OS support before enabling AVX2
James Almer [Tue, 25 Mar 2014 08:27:08 +0000 (05:27 -0300)]
x86/cpu: check for OS support before enabling AVX2

AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: mention default in documentation
rogerdpack [Mon, 24 Mar 2014 19:00:48 +0000 (13:00 -0600)]
udp: mention default in documentation

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: log error and continue if unable to set audio buffer
rogerdpack [Tue, 25 Mar 2014 16:08:49 +0000 (10:08 -0600)]
dshow: log error and continue if unable to set audio buffer

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd an .oga muxer.
Carl Eugen Hoyos [Tue, 25 Mar 2014 14:47:55 +0000 (15:47 +0100)]
Add an .oga muxer.

6 years agoDo not set swscale sizeFactor to -1.
Carl Eugen Hoyos [Tue, 25 Mar 2014 14:46:35 +0000 (15:46 +0100)]
Do not set swscale sizeFactor to -1.

Fixes ticket #3495.

6 years agoswscale: add two spatially stable dithering methods
Øyvind Kolås [Sun, 23 Mar 2014 01:13:26 +0000 (02:13 +0100)]
swscale: add two spatially stable dithering methods

Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).

These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results

6 years agolibavcodec/*/vp8dsp_init: indent
Peter Ross [Fri, 14 Feb 2014 11:58:36 +0000 (22:58 +1100)]
libavcodec/*/vp8dsp_init: indent

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riff: add On2 VP7 fourccs
Peter Ross [Fri, 14 Feb 2014 12:00:49 +0000 (23:00 +1100)]
avformat/riff: add On2 VP7 fourccs

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoOn2 VP7 decoder
Peter Ross [Tue, 18 Feb 2014 10:52:30 +0000 (21:52 +1100)]
On2 VP7 decoder

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8: vp8_find_free_buffer
Peter Ross [Fri, 14 Feb 2014 11:58:55 +0000 (22:58 +1100)]
avcodec/vp8: vp8_find_free_buffer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add missing includes
Vittorio Giovara [Sat, 22 Mar 2014 23:34:13 +0000 (23:34 +0000)]
avcodec: add missing includes

6 years agoavconv: More descriptive message about framedrop
Vittorio Giovara [Tue, 25 Mar 2014 11:26:24 +0000 (12:26 +0100)]
avconv: More descriptive message about framedrop

6 years agovf_transpose: K&R formatting cosmetics
Vittorio Giovara [Tue, 25 Mar 2014 07:39:24 +0000 (07:39 +0000)]
vf_transpose: K&R formatting cosmetics

6 years agoavcodec/svq1enc: fix undefined pointer operation
Michael Niedermayer [Tue, 25 Mar 2014 02:34:00 +0000 (03:34 +0100)]
avcodec/svq1enc: fix undefined pointer operation

Fixes Ticket3152

This also removes the dependance on ff_init_block_index/ff_update_block_index()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/mpegvideoenc_template: fix integer overflow
Michael Niedermayer [Mon, 24 Mar 2014 23:15:52 +0000 (00:15 +0100)]
avcodec/x86/mpegvideoenc_template: fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodox/scaler:fix bicubiclin typo
Michael Niedermayer [Mon, 24 Mar 2014 21:04:52 +0000 (22:04 +0100)]
dox/scaler:fix bicubiclin typo

See Ticket3486

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 20:23:54 +0000 (21:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Only use one memcpy for headers

See: ecb5b9c098009787e02f6de9e2d3e1786531c2f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'
Michael Niedermayer [Mon, 24 Mar 2014 20:05:41 +0000 (21:05 +0100)]
Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'

* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
  libx265: Write global extradata when requested

See: dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
Michael Niedermayer [Mon, 24 Mar 2014 19:55:23 +0000 (20:55 +0100)]
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'

* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
  build: Add config option for CABAC code

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: use ff_h264_set_erpic() instead of memset
Michael Niedermayer [Mon, 24 Mar 2014 18:58:05 +0000 (19:58 +0100)]
avcodec/h264: use ff_h264_set_erpic() instead of memset

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: move packet deallocation into write_frame
Michael Niedermayer [Mon, 24 Mar 2014 18:50:39 +0000 (19:50 +0100)]
ffmpeg: move packet deallocation into write_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Mar 2014 15:45:29 +0000 (16:45 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
Michael Niedermayer [Mon, 24 Mar 2014 15:40:35 +0000 (16:40 +0100)]
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'

* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a220b07b0f971f88213aef012aea51af2800be62'
Michael Niedermayer [Mon, 24 Mar 2014 15:25:31 +0000 (16:25 +0100)]
Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'

* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx265: Only use one memcpy for headers
Derek Buitenhuis [Sun, 23 Mar 2014 14:31:06 +0000 (14:31 +0000)]
libx265: Only use one memcpy for headers

They're guaranteed by the x265 API to be contiguous in memory.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Simple cosmetic fix
Derek Buitenhuis [Sun, 23 Mar 2014 14:39:46 +0000 (14:39 +0000)]
libx265: Simple cosmetic fix

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Only use one memcpy for headers
Derek Buitenhuis [Sun, 23 Mar 2014 14:31:06 +0000 (14:31 +0000)]
libx265: Only use one memcpy for headers

They're guaranteed by the x265 API to be contiguous in memory.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Write global extradata when requested
Michael Niedermayer [Fri, 14 Mar 2014 03:26:24 +0000 (04:26 +0100)]
libx265: Write global extradata when requested

Matroska, MP4, and other containers require it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoMerge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'
Michael Niedermayer [Mon, 24 Mar 2014 15:08:01 +0000 (16:08 +0100)]
Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'
Michael Niedermayer [Mon, 24 Mar 2014 14:48:19 +0000 (15:48 +0100)]
Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'

* commit 'f759f66e367bc62ed7738a51040f775b656a60d8':
  avconv: explicitly report when the muxing overhead is unknown

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'
Michael Niedermayer [Mon, 24 Mar 2014 14:45:47 +0000 (15:45 +0100)]
Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'

* commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e':
  avconv: remove unused nb_frames_dup

Conflicts:
ffmpeg.c

No change, as the variable is not unused

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Add config option for CABAC code
Diego Biurrun [Sat, 22 Mar 2014 17:41:43 +0000 (18:41 +0100)]
build: Add config option for CABAC code

This allows for more elegant dependency and object declarations.

6 years agoMerge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
Michael Niedermayer [Mon, 24 Mar 2014 14:32:48 +0000 (15:32 +0100)]
Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'

* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
  {v,a}f_showinfo: print frame side data

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'
Michael Niedermayer [Mon, 24 Mar 2014 14:11:08 +0000 (15:11 +0100)]
Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'

* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
  mp3dec: export replaygain tags from ID3v2

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
Michael Niedermayer [Mon, 24 Mar 2014 14:04:47 +0000 (15:04 +0100)]
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'

* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
  af_volume: support using replaygain frame side data

Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'
Michael Niedermayer [Mon, 24 Mar 2014 13:51:44 +0000 (14:51 +0100)]
Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5':
  frame: add a function for removing side data from a frame

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'
Michael Niedermayer [Mon, 24 Mar 2014 13:44:22 +0000 (14:44 +0100)]
Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'

* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9':
  avconv: add stream-global side data to the first demuxed packet

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a0f6651434c6f213d830140f575b4ec7858519f'
Michael Niedermayer [Mon, 24 Mar 2014 13:26:17 +0000 (14:26 +0100)]
Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'

* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
Michael Niedermayer [Mon, 24 Mar 2014 13:03:55 +0000 (14:03 +0100)]
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'

* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
  Add replaygain side data type and code for parsing replaygain tags.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agoavconv: don't warn on multiple frames per packet for codecs that expect it
Anton Khirnov [Mon, 17 Mar 2014 10:14:14 +0000 (11:14 +0100)]
avconv: don't warn on multiple frames per packet for codecs that expect it

6 years agoavconv: print verbose per-stream transcoding statistics
Anton Khirnov [Mon, 17 Mar 2014 09:58:05 +0000 (10:58 +0100)]
avconv: print verbose per-stream transcoding statistics

6 years agoavconv: split printing the final statistics into a separate function
Anton Khirnov [Mon, 17 Mar 2014 09:09:09 +0000 (10:09 +0100)]
avconv: split printing the final statistics into a separate function

6 years agoavconv: rewrite output data size tracking
Anton Khirnov [Mon, 17 Mar 2014 09:03:47 +0000 (10:03 +0100)]
avconv: rewrite output data size tracking

Store a variable per OutputStream instead of globals for
audio/video/extradata. This makes the code simpler and cleaner and fixes
2pass with multiple output streams.

6 years agoavconv: explicitly report when the muxing overhead is unknown
Anton Khirnov [Mon, 17 Mar 2014 09:00:38 +0000 (10:00 +0100)]
avconv: explicitly report when the muxing overhead is unknown

6 years agoavconv: remove unused nb_frames_dup
Anton Khirnov [Mon, 17 Mar 2014 06:15:02 +0000 (07:15 +0100)]
avconv: remove unused nb_frames_dup

Frame duplication now happens in vf_fps.

6 years ago{v,a}f_showinfo: print frame side data
Anton Khirnov [Wed, 19 Feb 2014 17:48:15 +0000 (18:48 +0100)]
{v,a}f_showinfo: print frame side data

6 years agomp3dec: export replaygain tags from ID3v2
Anton Khirnov [Wed, 19 Feb 2014 20:02:12 +0000 (21:02 +0100)]
mp3dec: export replaygain tags from ID3v2

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 agoaf_volume: support using replaygain frame side data
Anton Khirnov [Wed, 19 Feb 2014 20:01:37 +0000 (21:01 +0100)]
af_volume: support using replaygain frame side data

6 years agoframe: add a function for removing side data from a frame
Anton Khirnov [Wed, 19 Feb 2014 19:11:21 +0000 (20:11 +0100)]
frame: add a function for removing side data from a frame

6 years agoavconv: add stream-global side data to the first demuxed packet
Anton Khirnov [Wed, 19 Feb 2014 17:49:48 +0000 (18:49 +0100)]
avconv: add stream-global side data to the first demuxed packet

6 years agolibavcodec: when decoding, copy replaygain side data to decoded frames
Anton Khirnov [Wed, 19 Feb 2014 17:52:26 +0000 (18:52 +0100)]
libavcodec: when decoding, copy replaygain side data to decoded frames

6 years agoAdd replaygain side data type and code for parsing replaygain tags.
Anton Khirnov [Wed, 19 Feb 2014 14:29:06 +0000 (15:29 +0100)]
Add replaygain side data type and code for parsing replaygain tags.

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