ffmpeg.git
5 years agoMap --enable-lto to -ipo when compiling with icc.
Carl Eugen Hoyos [Sun, 4 May 2014 15:16:26 +0000 (17:16 +0200)]
Map --enable-lto to -ipo when compiling with icc.

5 years agoDisable inline_asm_direct_symbol_refs if lto was requested.
Carl Eugen Hoyos [Sun, 4 May 2014 15:09:21 +0000 (17:09 +0200)]
Disable inline_asm_direct_symbol_refs if lto was requested.

This fixes link time optimizations with gcc without disabling inline asm.

Fixes ticket #2941.

5 years agoavcodec/h263dec: use AV_EF_IGNORE_ERR
Michael Niedermayer [Fri, 2 May 2014 14:33:56 +0000 (16:33 +0200)]
avcodec/h263dec: use AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add AV_EF_IGNORE_ERR
Michael Niedermayer [Fri, 2 May 2014 14:37:28 +0000 (16:37 +0200)]
avformat: add AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: add AV_EF_IGNORE_ERR
Michael Niedermayer [Fri, 2 May 2014 14:33:32 +0000 (16:33 +0200)]
avcodec: add AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/codecs: document ignore_err
Michael Niedermayer [Fri, 2 May 2014 16:39:45 +0000 (18:39 +0200)]
doc/codecs: document ignore_err

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/lut3d: support 3DLUTSIZE directive for Davinci files.
Clément Bœsch [Sun, 4 May 2014 08:36:53 +0000 (10:36 +0200)]
avfilter/lut3d: support 3DLUTSIZE directive for Davinci files.

Fixes Ticket #2847.

5 years agoMAINTAINERS: add myself as lavd/xv maintainer
Lukasz Marek [Fri, 2 May 2014 22:16:02 +0000 (00:16 +0200)]
MAINTAINERS: add myself as lavd/xv maintainer

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMaintainers: add myself for msvc and icl.
Matt Oliver [Sat, 3 May 2014 07:55:24 +0000 (17:55 +1000)]
Maintainers: add myself for msvc and icl.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoEnable inline asm in intel compiler on windows.
Matt Oliver [Sat, 3 May 2014 09:37:53 +0000 (19:37 +1000)]
Enable inline asm in intel compiler on windows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 3 May 2014 23:23:53 +0000 (01:23 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Initialize riff and wav size fields to -1 instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'
Michael Niedermayer [Sat, 3 May 2014 23:14:30 +0000 (01:14 +0200)]
Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'

* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
libavformat/utils.c

See: 7bdc5de33d21411e5e742670d669d9908d47a1cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'
Michael Niedermayer [Sat, 3 May 2014 21:53:52 +0000 (23:53 +0200)]
Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
  latm: Add a probe function

Conflicts:
libavformat/rawdec.c

See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'
Michael Niedermayer [Sat, 3 May 2014 21:46:36 +0000 (23:46 +0200)]
Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

* commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f':
  mathematics: K&R formatting cosmetics

Conflicts:
libavutil/mathematics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a177a9cca924e097265b32f9282814f6b653e08'
Michael Niedermayer [Sat, 3 May 2014 21:36:01 +0000 (23:36 +0200)]
Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08':
  swscale: Fix an undefined behaviour

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '925c37874b617816b6f460c6f229c18b46548b46'
Michael Niedermayer [Sat, 3 May 2014 21:29:20 +0000 (23:29 +0200)]
Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

* commit '925c37874b617816b6f460c6f229c18b46548b46':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

See: c72f587353d9f88c7fbbbf6ef78b1d9ba3d38fd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'
Michael Niedermayer [Sat, 3 May 2014 21:21:21 +0000 (23:21 +0200)]
Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'

* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
Michael Niedermayer [Sat, 3 May 2014 21:15:37 +0000 (23:15 +0200)]
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'

* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: add cast to silence pointer type warning
Michael Niedermayer [Sat, 3 May 2014 20:54:01 +0000 (22:54 +0200)]
avcodec/jpeglsdec: add cast to silence pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_deshake: dont pass the wrong context into the SAD functions
Michael Niedermayer [Sat, 3 May 2014 20:52:17 +0000 (22:52 +0200)]
avfilter/vf_deshake: dont pass the wrong context into the SAD functions

This fixes pointer type warnings
The context should have been unused so this should not fix any real bug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snow_dwt: fix "incompatible pointer type" warnings
Michael Niedermayer [Sat, 3 May 2014 20:49:21 +0000 (22:49 +0200)]
avcodec/snow_dwt: fix "incompatible pointer type" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoInitialize riff and wav size fields to -1 instead of 0.
Carl Eugen Hoyos [Sat, 3 May 2014 18:18:13 +0000 (20:18 +0200)]
Initialize riff and wav size fields to -1 instead of 0.

WMP doess not play the output files if the fields are
set to 0 and not overwritten (using pipe output).

Fixes ticket #3346.

5 years agoavcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type"
Michael Niedermayer [Sat, 3 May 2014 20:09:26 +0000 (22:09 +0200)]
avcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/xbmdec: fix pointer type warnings
Michael Niedermayer [Sat, 3 May 2014 20:07:54 +0000 (22:07 +0200)]
avcodec/xbmdec: fix pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263dec: fix "incompatible pointer type" warning
Michael Niedermayer [Sat, 3 May 2014 18:23:12 +0000 (20:23 +0200)]
avcodec/h263dec: fix "incompatible pointer type" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/audio: use av_mallocz_array()
Michael Niedermayer [Sat, 3 May 2014 17:23:44 +0000 (19:23 +0200)]
avfilter/audio: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcdoec/snowenc: use av_mallocz_array()
Michael Niedermayer [Sat, 3 May 2014 17:22:37 +0000 (19:22 +0200)]
avcdoec/snowenc: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1dec: use av_malloc_array()
Michael Niedermayer [Sat, 3 May 2014 17:18:22 +0000 (19:18 +0200)]
avcodec/ffv1dec: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/edgedetect: update copyright.
Clément Bœsch [Sat, 3 May 2014 17:10:28 +0000 (19:10 +0200)]
avfilter/edgedetect: update copyright.

5 years agoavfilter/edgedetect: reindent after previous commit.
Clément Bœsch [Sat, 3 May 2014 16:46:16 +0000 (18:46 +0200)]
avfilter/edgedetect: reindent after previous commit.

5 years agoavfilter/edgedetect: add a colormix mode.
Clément Bœsch [Sat, 3 May 2014 15:41:32 +0000 (17:41 +0200)]
avfilter/edgedetect: add a colormix mode.

5 years agoprobe: Support AAC_LATM in set_codec_from_probe_data
Luca Barbato [Sat, 26 Apr 2014 19:10:30 +0000 (21:10 +0200)]
probe: Support AAC_LATM in set_codec_from_probe_data

5 years agolatm: Add a probe function
Luca Barbato [Sat, 26 Apr 2014 18:32:47 +0000 (20:32 +0200)]
latm: Add a probe function

5 years agomathematics: K&R formatting cosmetics
Luca Barbato [Thu, 1 May 2014 12:54:06 +0000 (14:54 +0200)]
mathematics: K&R formatting cosmetics

5 years agoswscale: Fix an undefined behaviour
Luca Barbato [Thu, 1 May 2014 22:21:23 +0000 (00:21 +0200)]
swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agovp9: Read the frame size as unsigned
Luca Barbato [Thu, 1 May 2014 22:18:04 +0000 (00:18 +0200)]
vp9: Read the frame size as unsigned

Sample-Id: 00001723-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agoavfilter/edgedetect: make processing functions context free.
Clément Bœsch [Sat, 3 May 2014 12:57:51 +0000 (14:57 +0200)]
avfilter/edgedetect: make processing functions context free.

5 years agox86/cavdsp: prevent named constraints appearing twice.
Matt Oliver [Sat, 3 May 2014 07:59:20 +0000 (17:59 +1000)]
x86/cavdsp: prevent named constraints appearing twice.

5 years agoRemove two duplicated named asm constraints.
Carl Eugen Hoyos [Sat, 3 May 2014 06:25:05 +0000 (06:25 +0000)]
Remove two duplicated named asm constraints.

This fixes compilation of libmpcodecs/vf_fspp.c with gcc and
INLINE_ASM_DIRECT_SYMBOL_REFS disabled.

5 years agovfilter/vf_yadif: fix request_frame after 0f9f24c9
Michael Niedermayer [Sat, 3 May 2014 14:07:50 +0000 (16:07 +0200)]
vfilter/vf_yadif: fix request_frame after 0f9f24c9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: mark recovery_cnt==0 frames as keyframes
Michael Niedermayer [Sun, 3 Nov 2013 16:24:05 +0000 (17:24 +0100)]
avcodec/h264: mark recovery_cnt==0 frames as keyframes

Fixes Ticket3063

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of dsd planar decoders.
Carl Eugen Hoyos [Sat, 3 May 2014 06:53:57 +0000 (08:53 +0200)]
Fix standalone compilation of dsd planar decoders.

5 years agoFix oga muxer standalone compilation.
Carl Eugen Hoyos [Sat, 3 May 2014 06:51:27 +0000 (08:51 +0200)]
Fix oga muxer standalone compilation.

5 years agoavfilter/vf_showinfo: also calculate and show mean and standard deviation
Michael Niedermayer [Sat, 3 May 2014 04:02:42 +0000 (06:02 +0200)]
avfilter/vf_showinfo: also calculate and show mean and standard deviation

Fixes Ticket3013

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: more dates and hashes
Michael Niedermayer [Sat, 3 May 2014 01:36:08 +0000 (03:36 +0200)]
doc/APIchanges: more dates and hashes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: add hashes and dates
Lukasz Marek [Sat, 3 May 2014 00:48:45 +0000 (02:48 +0200)]
doc/APIchanges: add hashes and dates

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90ac...
mplayer developers [Sat, 3 May 2014 00:29:39 +0000 (02:29 +0200)]
libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41)

Authors from svn:
cehoyos (2):
      Support playback of JPEG 2000 digital cinema files.
      Add name for image format IMGFMT_440P.

ib (1):
      Get rid of VOCTRL_GUI_NOWINDOW.

Matt Oliver (4):
      Fix libmpcodecs inline asm on ICL.
      Use DECLARE_ALIGNED helper macros.
      Remove some superfluous commas from inline asm for better compatibility.
      Use numeric labels in inline asm for consistency and better     compatibility.

reimar (10):
      Fix bpp calculation for XYZ format.
      Avoid duplicating the mouse autohide code.
      Add NV12/NV21 support to some helper functions.
      Add support for rotating the video via OpenGL.
      Add options to determine where borders will be added when adjusting for aspect.
      Apply forgotten move of apply_border_pos function.
      Extract window creation code to common file.
      Make VDPAU support work again with latest FFmpeg.
      img_format: document why mp_get_chroma_shift does not work for NV12/NV21
      Minor spelling/grammar fixes.

For detailed line by line authorship please see svn log of mplayer
svn://svn.mplayerhq.hu/mplayer/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: fix message names in opengl doc
Lukasz Marek [Fri, 2 May 2014 22:29:05 +0000 (00:29 +0200)]
doc: fix message names in opengl doc

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263dec: print MB position for each MB when TRACE is enabled
Michael Niedermayer [Fri, 2 May 2014 20:47:11 +0000 (22:47 +0200)]
avcodec/h263dec: print MB position for each MB when TRACE is enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 2 May 2014 16:46:20 +0000 (18:46 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: reident after previous commits
  lavf/mux: pass options to nested structs of priv data
  lavu/opt: add av_opt_set_dict2() function
  lavd/opengl_enc: fix window size correction code
  lavd/opengl_enc: add window size param
  lavd/opengl_enc: use flag to mark inited context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: reident after previous commits
Lukasz Marek [Fri, 2 May 2014 15:52:57 +0000 (17:52 +0200)]
lavd/xv: reident after previous commits

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/mux: pass options to nested structs of priv data
Lukasz Marek [Tue, 29 Apr 2014 22:00:44 +0000 (00:00 +0200)]
lavf/mux: pass options to nested structs of priv data

This commit allows to benefit from implementing child_next
callback for muxers' AVClasses.
Without that, options cannot be set in nested structs.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: add av_opt_set_dict2() function
Lukasz Marek [Tue, 29 Apr 2014 21:57:24 +0000 (23:57 +0200)]
lavu/opt: add av_opt_set_dict2() function

Existing av_opt_set_dict doesn't accept flags.
It doesn't allow to pass options to nested structs.
New function alllows that.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/opengl_enc: fix window size correction code
Lukasz Marek [Thu, 1 May 2014 22:28:27 +0000 (00:28 +0200)]
lavd/opengl_enc: fix window size correction code

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/opengl_enc: add window size param
Lukasz Marek [Thu, 1 May 2014 22:16:25 +0000 (00:16 +0200)]
lavd/opengl_enc: add window size param

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/opengl_enc: use flag to mark inited context
Lukasz Marek [Thu, 1 May 2014 22:06:38 +0000 (00:06 +0200)]
lavd/opengl_enc: use flag to mark inited context

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/mpegvideo: fix gray*() parameter types
Michael Niedermayer [Fri, 2 May 2014 15:12:26 +0000 (17:12 +0200)]
avcodec/mpegvideo: fix gray*() parameter types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: support disabling motion compensation
Michael Niedermayer [Fri, 2 May 2014 13:57:59 +0000 (15:57 +0200)]
avcodec/mpegvideo: support disabling motion compensation

This allows analyzing videos without having prior and current frames mixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoEnable opencl wihtout pthreads.
Matt Oliver [Fri, 2 May 2014 02:49:23 +0000 (12:49 +1000)]
Enable opencl wihtout pthreads.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_yadif: fix filtering a single image
Michael Niedermayer [Fri, 2 May 2014 00:08:19 +0000 (02:08 +0200)]
avfilter/vf_yadif: fix filtering a single image

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxvid: improve return codes
Michael Niedermayer [Thu, 1 May 2014 21:08:01 +0000 (23:08 +0200)]
avcodec/libxvid: improve return codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out
Michael Niedermayer [Thu, 1 May 2014 20:59:59 +0000 (22:59 +0200)]
avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()
Michael Niedermayer [Thu, 1 May 2014 19:40:42 +0000 (21:40 +0200)]
avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: ff_decode_frame_props: set pkt_size
Michael Niedermayer [Thu, 1 May 2014 19:18:57 +0000 (21:18 +0200)]
avcodec/utils: ff_decode_frame_props: set pkt_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: put the sizeof() second in av_malloc_array()
Michael Niedermayer [Thu, 1 May 2014 19:02:45 +0000 (21:02 +0200)]
ffmpeg: put the sizeof() second in av_malloc_array()

This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoopencl: add support for non-pthread locking
Matt Oliver [Thu, 1 May 2014 09:21:29 +0000 (19:21 +1000)]
opencl: add support for non-pthread locking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wtvdec: ignore mpeg2 extradata
Peter Ross [Thu, 1 May 2014 12:22:09 +0000 (22:22 +1000)]
avformat/wtvdec: ignore mpeg2 extradata

Files produced by windows media center contain meaningless mpeg1 sequence
header. The mpeg2 decoder detects the presence mpeg1 sequence header start
codes and attempts to decode the stream as mpeg1. (This problem introduced
in 73a2d16b.)

Fixes ticket #3601.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
Michael Niedermayer [Thu, 1 May 2014 16:04:39 +0000 (18:04 +0200)]
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'

* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
  lavc: deprecate AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'
Michael Niedermayer [Thu, 1 May 2014 16:00:27 +0000 (18:00 +0200)]
Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:
libavcodec/utils.c

See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'
Michael Niedermayer [Thu, 1 May 2014 15:49:38 +0000 (17:49 +0200)]
Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'

* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca':
  rmdec: do not export anything to AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'
Michael Niedermayer [Thu, 1 May 2014 15:40:14 +0000 (17:40 +0200)]
Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d':
  asfenc: use codec descriptors instead of AVCodecs to write codec info

Conflicts:
tests/ref/lavf/asf
tests/ref/seek/lavf-asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'
Michael Niedermayer [Thu, 1 May 2014 15:25:50 +0000 (17:25 +0200)]
Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'

* commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0':
  oggparseskeleton: do not use AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'
Michael Niedermayer [Thu, 1 May 2014 15:13:05 +0000 (17:13 +0200)]
Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
  mov: export stsd Compressorname in metadata

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
Michael Niedermayer [Thu, 1 May 2014 15:03:59 +0000 (17:03 +0200)]
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
Michael Niedermayer [Thu, 1 May 2014 14:56:40 +0000 (16:56 +0200)]
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:
libavcodec/libxvid.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
Michael Niedermayer [Thu, 1 May 2014 14:46:38 +0000 (16:46 +0200)]
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
  lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
Michael Niedermayer [Thu, 1 May 2014 14:41:41 +0000 (16:41 +0200)]
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/vobsub: use av_make_q().
Clément Bœsch [Thu, 1 May 2014 14:18:12 +0000 (16:18 +0200)]
avformat/vobsub: use av_make_q().

5 years agoavformat/vobsub: remove pointless FAIL macro.
Clément Bœsch [Thu, 1 May 2014 14:16:38 +0000 (16:16 +0200)]
avformat/vobsub: remove pointless FAIL macro.

5 years agoMerge commit '141fdc763c2841b572d29a2ad78513e8d5325870'
Michael Niedermayer [Thu, 1 May 2014 13:59:01 +0000 (15:59 +0200)]
Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

See: 30549294ef0f796d48b1ffa482bd9315d4dbb83c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'
Michael Niedermayer [Thu, 1 May 2014 13:02:44 +0000 (15:02 +0200)]
Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'

* commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1':
  matroskaenc: write CodecDelay

Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

This is largely not merged as it causes assertion failures and av sync errors
Further investigation of this is warranted if the changes are found to
fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74

See: d92b1b1babe69268971863649c225e1747358a74
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'
Michael Niedermayer [Thu, 1 May 2014 12:14:10 +0000 (14:14 +0200)]
Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'

* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaac: K&R formatting cosmetics
Luca Barbato [Sat, 26 Apr 2014 17:02:36 +0000 (19:02 +0200)]
aac: K&R formatting cosmetics

5 years agoflv: K&R formatting cosmetics
Luca Barbato [Sat, 26 Apr 2014 12:09:55 +0000 (14:09 +0200)]
flv: K&R formatting cosmetics

5 years agolavfi/subtitles: introduce stream_index
ValdikSS [Thu, 1 May 2014 10:51:17 +0000 (14:51 +0400)]
lavfi/subtitles: introduce stream_index

Signed-off-by: ValdikSS <iam@valdikss.org.ru>
5 years agolavc: deprecate AVCodecContext.codec_name
Anton Khirnov [Tue, 29 Apr 2014 14:44:08 +0000 (16:44 +0200)]
lavc: deprecate AVCodecContext.codec_name

It is undocumented and has no real use.

5 years agolavc: do not use AVCodecContext.codec_name in avcodec_string()
Anton Khirnov [Tue, 29 Apr 2014 14:42:07 +0000 (16:42 +0200)]
lavc: do not use AVCodecContext.codec_name in avcodec_string()

That field will be deprecated.

5 years agormdec: do not export anything to AVCodecContext.codec_name
Anton Khirnov [Tue, 29 Apr 2014 14:40:55 +0000 (16:40 +0200)]
rmdec: do not export anything to AVCodecContext.codec_name

That field will be deprecated and the value that is written there is not
particularly useful.

5 years agoasfenc: use codec descriptors instead of AVCodecs to write codec info
Anton Khirnov [Tue, 29 Apr 2014 14:13:38 +0000 (16:13 +0200)]
asfenc: use codec descriptors instead of AVCodecs to write codec info

Also, stop using AVCodecContext.codec_name as fallback, since it will be
deprecated.

Changes the result of the lavf-asf test (and its associated seektest),
since 'msmpeg4v3' gets written instead of just 'msmpeg4'.

5 years agooggparseskeleton: do not use AVCodecContext.codec_name
Anton Khirnov [Tue, 29 Apr 2014 13:42:38 +0000 (15:42 +0200)]
oggparseskeleton: do not use AVCodecContext.codec_name

That field is undocumented, of dubious use, and will be deprecated.

5 years agomov: export stsd Compressorname in metadata
Anton Khirnov [Tue, 29 Apr 2014 13:37:52 +0000 (15:37 +0200)]
mov: export stsd Compressorname in metadata

Stop using the undocumented to-be-deprecated AVCodecContext.codec_name
field.

5 years agolavc: move CODEC_FLAG_MV0 to mpegvideo
Anton Khirnov [Tue, 29 Apr 2014 06:00:03 +0000 (08:00 +0200)]
lavc: move CODEC_FLAG_MV0 to mpegvideo

5 years agolavc: make the xvid-specific "gmc" flag a private option of libxvid
Anton Khirnov [Tue, 29 Apr 2014 06:08:43 +0000 (08:08 +0200)]
lavc: make the xvid-specific "gmc" flag a private option of libxvid

5 years agolavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Anton Khirnov [Tue, 29 Apr 2014 06:00:03 +0000 (08:00 +0200)]
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

5 years agolavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Anton Khirnov [Tue, 29 Apr 2014 05:50:16 +0000 (07:50 +0200)]
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

The addition of reference-counted frames makes it pointless.

5 years agomatroska: add the Opus mapping
Anton Khirnov [Sun, 27 Apr 2014 11:40:11 +0000 (13:40 +0200)]
matroska: add the Opus mapping

5 years agomatroskaenc: write CodecDelay
Anton Khirnov [Tue, 29 Apr 2014 10:26:38 +0000 (12:26 +0200)]
matroskaenc: write CodecDelay

5 years agolavfi: add Bauer stereo-to-binaural audio filter
Alessandro Ghedini [Tue, 29 Apr 2014 16:53:16 +0000 (18:53 +0200)]
lavfi: add Bauer stereo-to-binaural audio filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/avidec: set average frame rate from header
Michael Niedermayer [Thu, 1 May 2014 03:40:00 +0000 (05:40 +0200)]
avformat/avidec: set average frame rate from header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'
Michael Niedermayer [Thu, 1 May 2014 02:27:17 +0000 (04:27 +0200)]
Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'

* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
  matroskadec: read the CodecDelay element

Conflicts:
libavformat/matroska.h
libavformat/matroskadec.c

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