ffmpeg.git
6 years agoMerge commit 'b047c68783aa4042b322af7af043b643d5daf09c'
Michael Niedermayer [Sun, 23 Dec 2012 13:36:47 +0000 (14:36 +0100)]
Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'

* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
  4xm: don't rely on get_buffer() initializing the frame.
  huffyuv: split encoder and decoder into separate files.
  lavc: make pkt_{p,d}ts doxy less confusing

Conflicts:
libavcodec/Makefile
libavcodec/huffyuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '418693bdc5edad72b0d055f741931612d797eb05'
Michael Niedermayer [Sun, 23 Dec 2012 12:28:01 +0000 (13:28 +0100)]
Merge commit '418693bdc5edad72b0d055f741931612d797eb05'

* commit '418693bdc5edad72b0d055f741931612d797eb05':
  lavc: rewrite and extend AVFrame doxy
  opt: avoid segfault in av_opt_next() if the class does not have an option list
  ttadec: fix last frame handling when seeking
  alacdec: do not be too strict about the extradata size

Conflicts:
libavcodec/alac.c
libavcodec/avcodec.h
libavcodec/tta.c
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: don't rely on get_buffer() initializing the frame.
Anton Khirnov [Tue, 13 Nov 2012 21:10:54 +0000 (22:10 +0100)]
4xm: don't rely on get_buffer() initializing the frame.

6 years agohuffyuv: split encoder and decoder into separate files.
Anton Khirnov [Thu, 6 Dec 2012 13:06:46 +0000 (14:06 +0100)]
huffyuv: split encoder and decoder into separate files.

6 years agolavc: make pkt_{p,d}ts doxy less confusing
Anton Khirnov [Fri, 21 Dec 2012 20:52:34 +0000 (21:52 +0100)]
lavc: make pkt_{p,d}ts doxy less confusing

6 years agolavc: rewrite and extend AVFrame doxy
Anton Khirnov [Fri, 21 Dec 2012 20:50:50 +0000 (21:50 +0100)]
lavc: rewrite and extend AVFrame doxy

6 years agolibpostproc: fix leak of 2kb
Michael Niedermayer [Sun, 23 Dec 2012 03:48:36 +0000 (04:48 +0100)]
libpostproc: fix leak of 2kb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: fix edge emulation of dimension%16 != 0 for YUV != 420
Michael Niedermayer [Sun, 23 Dec 2012 03:13:17 +0000 (04:13 +0100)]
mpegvideo_enc: fix edge emulation of dimension%16 != 0 for YUV != 420

Fixes Ticket2041

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/y4m: spellcheck
James Darnley [Sat, 22 Dec 2012 12:53:34 +0000 (13:53 +0100)]
lavf/y4m: spellcheck

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agormdec: set bit rate for ra4
Piotr Bandurski [Sat, 22 Dec 2012 13:41:12 +0000 (14:41 +0100)]
rmdec: set bit rate for ra4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodocs: point to aresample from asyncts docs
Michael Niedermayer [Tue, 18 Dec 2012 00:25:10 +0000 (01:25 +0100)]
docs: point to aresample from asyncts docs

"Fixes" Ticket2036

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/hlsenc: reuse pattern string, rather than redefining it
Stefano Sabatini [Thu, 20 Dec 2012 23:28:46 +0000 (00:28 +0100)]
lavf/hlsenc: reuse pattern string, rather than redefining it

Improve robustness.

6 years agolavf/hlsenc: fix basename size computation off-by-one bug
Stefano Sabatini [Thu, 20 Dec 2012 23:27:00 +0000 (00:27 +0100)]
lavf/hlsenc: fix basename size computation off-by-one bug

6 years agoopt: avoid segfault in av_opt_next() if the class does not have an option list
Justin Ruggles [Thu, 8 Nov 2012 23:35:49 +0000 (18:35 -0500)]
opt: avoid segfault in av_opt_next() if the class does not have an option list

CC: libav-stable@libav.org
6 years agottadec: fix last frame handling when seeking
Justin Ruggles [Fri, 10 Feb 2012 22:51:11 +0000 (17:51 -0500)]
ttadec: fix last frame handling when seeking

Using a frame count, as is done currently, does not work at all with
seeking. Instead, when the number of samples in the final frame has
been decoded, we check if only the 32-bit CRC is remaining. If so, we
assume that it is the final frame.

There is no longer a need to keep total_frames in TTAContext.

6 years agoconfigure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg
Johannes Nixdorf [Sun, 16 Dec 2012 15:02:08 +0000 (16:02 +0100)]
configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg

Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Detect POC inconsistencies and try to handle them reasonably
Michael Niedermayer [Sat, 22 Dec 2012 17:02:48 +0000 (18:02 +0100)]
h264: Detect POC inconsistencies and try to handle them reasonably

Improves the file from Ticket2050

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalacdec: do not be too strict about the extradata size
Justin Ruggles [Sat, 22 Dec 2012 06:21:09 +0000 (01:21 -0500)]
alacdec: do not be too strict about the extradata size

Sometimes the extradata has duplicate atoms, but that shouldn't prevent
decoding. Just ensure that it is at least 36 bytes as a sanity check.

CC: libav-stable@libav.org
6 years agoChangelog: add entry about the new documentation layout design
Stefano Sabatini [Fri, 21 Dec 2012 00:08:24 +0000 (01:08 +0100)]
Changelog: add entry about the new documentation layout design

6 years agodoc/filters: reword introduction sentence of aformat.
Clément Bœsch [Sat, 22 Dec 2012 14:40:03 +0000 (15:40 +0100)]
doc/filters: reword introduction sentence of aformat.

6 years agodoc/filters: simplify escaping in aformat.
Clément Bœsch [Sat, 22 Dec 2012 14:38:10 +0000 (15:38 +0100)]
doc/filters: simplify escaping in aformat.

Escaping the '=' is not necessary, and quoting the arguments allow to
remove the comma escaping as well.

6 years agodoc/filters: add overlay daisy-chaining example
Stefano Sabatini [Sat, 15 Dec 2012 14:36:30 +0000 (15:36 +0100)]
doc/filters: add overlay daisy-chaining example

6 years agodoc/filters: rework and itemize examples for the overlay filter
Stefano Sabatini [Sat, 15 Dec 2012 14:06:01 +0000 (15:06 +0100)]
doc/filters: rework and itemize examples for the overlay filter

6 years agolavfi/overlay: make use of av_opt_set_from_string()
Stefano Sabatini [Sat, 15 Dec 2012 13:50:09 +0000 (14:50 +0100)]
lavfi/overlay: make use of av_opt_set_from_string()

Simplify.

6 years agolavfi/overlay: switch to filter_frame API
Stefano Sabatini [Sat, 8 Dec 2012 14:15:20 +0000 (15:15 +0100)]
lavfi/overlay: switch to filter_frame API

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Dec 2012 12:25:53 +0000 (13:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flac: only set channel layout if not previously set or on channel count change
  prepare 9_beta3 release

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflac: only set channel layout if not previously set or on channel count change
Justin Ruggles [Sun, 16 Dec 2012 16:02:39 +0000 (11:02 -0500)]
flac: only set channel layout if not previously set or on channel count change

Fixes Bug 402

6 years agoffplay: fix another use of context instead of frame parameters
Michael Niedermayer [Fri, 21 Dec 2012 20:46:18 +0000 (21:46 +0100)]
ffplay: fix another use of context instead of frame parameters

Fixes Ticket2050

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: check the correct stream, fix fate
Michael Niedermayer [Sat, 22 Dec 2012 02:41:12 +0000 (03:41 +0100)]
4xm: check the correct stream, fix fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/4xm: use bytestream2_get_bytes_left
Paul B Mahol [Tue, 18 Dec 2012 18:16:36 +0000 (18:16 +0000)]
lavc/4xm: use bytestream2_get_bytes_left

Also replace relevant bytestream2 functions with unchecked variants due
code that already checks for overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/filters: rename reference to movie filter from "src_movie" to "movie"
Stefano Sabatini [Sat, 22 Dec 2012 00:01:36 +0000 (01:01 +0100)]
doc/filters: rename reference to movie filter from "src_movie" to "movie"

Should be less confusing.

6 years agovideodsp: Fix project name
Michael Niedermayer [Fri, 21 Dec 2012 17:37:52 +0000 (18:37 +0100)]
videodsp: Fix project name

These are all part of splited out dsp utils from FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/videodsp_init: Add back lost author attribution
Michael Niedermayer [Fri, 21 Dec 2012 17:26:09 +0000 (18:26 +0100)]
x86/videodsp_init: Add back lost author attribution

Code originates from:
910b9f30 libavcodec/dsputil.c            (David Conrad        2010-05-27 04:39:27 +0000  334) void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h,
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  335)                                     int src_x, int src_y, int w, int h){
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  336)     int x, y;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  337)     int start_y, start_x, end_y, end_x;
b5a093b3 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-25 20:22:36 +0000  338)
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  339)     if(src_y>= h){
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  340)         src+= (h-1-src_y)*linesize;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  341)         src_y=h-1;
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  342)     }else if(src_y<=-block_h){
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  343)         src+= (1-block_h-src_y)*linesize;
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  344)         src_y=1-block_h;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  345)     }
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  346)     if(src_x>= w){
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  347)         src+= (w-1-src_x);
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  348)         src_x=w-1;
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  349)     }else if(src_x<=-block_w){
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  350)         src+= (1-block_w-src_x);
225f9c44 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-15 00:25:53 +0000  351)         src_x=1-block_w;
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  352)     }
93a21abd libavcodec/mpegvideo.c          (Michael Niedermayer 2002-07-14 18:37:35 +0000  353)
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  354)     start_y= FFMAX(0, -src_y);
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  355)     start_x= FFMAX(0, -src_x);
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  356)     end_y= FFMIN(block_h, h-src_y);
b8a78f41 libavcodec/mpegvideo.c          (Michael Niedermayer 2002-11-10 11:46:59 +0000  357)     end_x= FFMIN(block_w, w-src_x);

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovideodsp_template.c: fix year
Michael Niedermayer [Fri, 21 Dec 2012 17:17:33 +0000 (18:17 +0100)]
videodsp_template.c: fix year

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/default.css: use ffmpeg.org website CSS
Stefano Sabatini [Thu, 20 Dec 2012 23:56:20 +0000 (00:56 +0100)]
doc/default.css: use ffmpeg.org website CSS

The attribute container of the top-level div is changed from "class" to
"id" to match the website CSS.

Improve consistency between website docs and local documentation style.

6 years agodoc: move HTML CSS to a dedicated file default.css
Stefano Sabatini [Thu, 20 Dec 2012 23:54:06 +0000 (00:54 +0100)]
doc: move HTML CSS to a dedicated file default.css

6 years agolavfi: declare arrays that never change as static const
Paul B Mahol [Fri, 21 Dec 2012 22:38:59 +0000 (22:38 +0000)]
lavfi: declare arrays that never change as static const

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoimg2enc: fix typo
Michael Niedermayer [Fri, 21 Dec 2012 21:56:13 +0000 (22:56 +0100)]
img2enc: fix typo

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: Warn in case the set bitrate is very low
Michael Niedermayer [Fri, 21 Dec 2012 21:50:57 +0000 (22:50 +0100)]
lavc: Warn in case the set bitrate is very low

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobetter failure message for img2enc
rogerdpack [Thu, 20 Dec 2012 16:53:30 +0000 (09:53 -0700)]
better failure message for img2enc

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyop: set video bit rate
Piotr Bandurski [Fri, 21 Dec 2012 00:29:40 +0000 (01:29 +0100)]
yop: set video bit rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/swapuv: use FFSWAP
Paul B Mahol [Fri, 21 Dec 2012 19:02:48 +0000 (19:02 +0000)]
lavfi/swapuv: use FFSWAP

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoRevert "Always write all colours for animated gif files, including transparent ones."
Carl Eugen Hoyos [Fri, 21 Dec 2012 17:18:39 +0000 (18:18 +0100)]
Revert "Always write all colours for animated gif files, including transparent ones."

It breaks some opaque samples.

This reverts commit d4fdaafdb76a927be6fea15013807641bbcc6bd9.

6 years agoSupport H264 over video4linux2.
Carl Eugen Hoyos [Fri, 21 Dec 2012 17:12:29 +0000 (18:12 +0100)]
Support H264 over video4linux2.

Tested-by: Val Malykh
6 years agoMerge commit 'c7d4de3d730473167e31cf765e0333c965f934d3'
Michael Niedermayer [Fri, 21 Dec 2012 16:51:25 +0000 (17:51 +0100)]
Merge commit 'c7d4de3d730473167e31cf765e0333c965f934d3'

* commit 'c7d4de3d730473167e31cf765e0333c965f934d3':
  rtpdec_vp8: Don't return known-broken packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'
Michael Niedermayer [Fri, 21 Dec 2012 16:46:43 +0000 (17:46 +0100)]
Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'

* commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59':
  rtpdec: Pass the sequence number to depacketizers
  configure: Make avconv depend on null, anull and resample filters

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
Michael Niedermayer [Fri, 21 Dec 2012 16:39:03 +0000 (17:39 +0100)]
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'

* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
  build: avfilter: Remove duplicate compilation entry for vf_scale

Conflicts:
libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
Michael Niedermayer [Fri, 21 Dec 2012 16:32:52 +0000 (17:32 +0100)]
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
  miscellaneous typo fixes

Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
Michael Niedermayer [Fri, 21 Dec 2012 16:18:43 +0000 (17:18 +0100)]
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'

* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
  lavc: add missing files for arm
  lavc: introduce VideoDSPContext

Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoprepare 9_beta3 release
Reinhard Tartler [Fri, 21 Dec 2012 14:16:33 +0000 (15:16 +0100)]
prepare 9_beta3 release

6 years agoalsdec: cosmetics after previous commit
Paul B Mahol [Fri, 21 Dec 2012 14:14:57 +0000 (14:14 +0000)]
alsdec: cosmetics after previous commit

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoalsdec: channel sorting
Paul B Mahol [Fri, 21 Dec 2012 12:51:08 +0000 (12:51 +0000)]
alsdec: channel sorting

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'a925f723a915bc0255e2673f8817af5212131763'
Michael Niedermayer [Fri, 21 Dec 2012 13:06:42 +0000 (14:06 +0100)]
Merge commit 'a925f723a915bc0255e2673f8817af5212131763'

* commit 'a925f723a915bc0255e2673f8817af5212131763':
  rtp: Don't read priv_data unless it is allocated
  flvenc: Check whether seeking back to the header succeeded
  sapenc: Pass the title on to the chained muxers

Conflicts:
libavformat/flvenc.c
libavformat/sapenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec_vp8: Don't return known-broken packets
Martin Storsjö [Tue, 11 Dec 2012 13:12:31 +0000 (15:12 +0200)]
rtpdec_vp8: Don't return known-broken packets

This is built on the assumption that the first partition of each
VP8 packet is essential for decoding any later packet - if this
partition is broken/missed, the arithmetic coder gets out of sync
and decoding the bitstream in further packet ends up with total
garbage. If packets of a frame are lost, make sure the first
partition is intact (return only this part of the packet, nothing
else), otherwise stop returning data until the next keyframe is
received.

Alternatively, one would simply not return any packets at all
until the next keyframe, if packet loss is detected.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Pass the sequence number to depacketizers
Martin Storsjö [Mon, 10 Dec 2012 12:38:32 +0000 (14:38 +0200)]
rtpdec: Pass the sequence number to depacketizers

This allows depacketizers to figure out if packets have been lost.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavf: Remove "Adjusting PTS forward" code
Michael Niedermayer [Fri, 21 Dec 2012 03:53:18 +0000 (04:53 +0100)]
lavf: Remove "Adjusting PTS forward" code

it causes problems (incorrectly detect TS discontinuities)
 with a brokan TS file (test-audio-broken.ts)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogifdec: remove dead store
Paul B Mahol [Fri, 21 Dec 2012 00:33:14 +0000 (00:33 +0000)]
gifdec: remove dead store

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffplay: fix handling of resolution changes with h264-mt
Michael Niedermayer [Thu, 20 Dec 2012 11:24:54 +0000 (12:24 +0100)]
ffplay: fix handling of resolution changes with h264-mt

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compilation with --disable-everything --enable-muxer=mov.
Carl Eugen Hoyos [Thu, 20 Dec 2012 23:27:34 +0000 (00:27 +0100)]
Fix compilation with --disable-everything --enable-muxer=mov.

6 years agoconfigure: Make avconv depend on null, anull and resample filters
Diego Biurrun [Tue, 18 Dec 2012 14:08:56 +0000 (15:08 +0100)]
configure: Make avconv depend on null, anull and resample filters

Building avconv without that functionality makes little sense.

6 years agobuild: avfilter: Remove duplicate compilation entry for vf_scale
Diego Biurrun [Thu, 20 Dec 2012 19:44:39 +0000 (20:44 +0100)]
build: avfilter: Remove duplicate compilation entry for vf_scale

vf_scale should not be unconditionally compiled even if disabled.

6 years agomiscellaneous typo fixes
Diego Biurrun [Wed, 19 Dec 2012 17:48:21 +0000 (18:48 +0100)]
miscellaneous typo fixes

6 years agolavf/hlsenc: provide some feedback in case of invalid basename
Stefano Sabatini [Thu, 20 Dec 2012 09:41:19 +0000 (10:41 +0100)]
lavf/hlsenc: provide some feedback in case of invalid basename

6 years agolavf/hlsenc: fix minor grammar inconsistencies in the option help messages
Stefano Sabatini [Thu, 20 Dec 2012 09:32:12 +0000 (10:32 +0100)]
lavf/hlsenc: fix minor grammar inconsistencies in the option help messages

6 years agodoc: remove inclusion of libav* documentation in tools
Stefano Sabatini [Mon, 17 Dec 2012 15:11:04 +0000 (16:11 +0100)]
doc: remove inclusion of libav* documentation in tools

This shrinks the tool manuals to a manageable size. Relevant manuals are
referenced in the "See Also" chapter.

Overall documentation inclusion should still be possible through the use
of a conditional variable set during configuration time, if someone feels
the need for a huge-wall-of-text-fashioned manual.

6 years agodoc/ffmpeg-formats: include metadata chapter
Stefano Sabatini [Thu, 20 Dec 2012 22:45:54 +0000 (23:45 +0100)]
doc/ffmpeg-formats: include metadata chapter

The metadata muxer/demuxer belongs to the formats documentation.

6 years agoAlways write all colours for animated gif files, including transparent ones.
Carl Eugen Hoyos [Thu, 20 Dec 2012 22:05:42 +0000 (23:05 +0100)]
Always write all colours for animated gif files, including transparent ones.

This fixes the colour of the transparent background (as seen with ffplay),
and makes the background of some non-keyframes transparent that was
incorrectly shown as opaque for some samples.

6 years agogifdec: fix invalid write in gif_copy_img_rect
Paul B Mahol [Thu, 20 Dec 2012 17:56:52 +0000 (17:56 +0000)]
gifdec: fix invalid write in gif_copy_img_rect

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agogifdec: fix invalid write in giff_fill_rect
Paul B Mahol [Thu, 20 Dec 2012 17:45:04 +0000 (17:45 +0000)]
gifdec: fix invalid write in giff_fill_rect

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmpeg_opt: fix recording time in->out carryover.
Michael Niedermayer [Thu, 20 Dec 2012 16:37:08 +0000 (17:37 +0100)]
ffmpeg_opt: fix recording time in->out carryover.

This should fix valgrind complaints.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/af_aconvert: update audio->channels.
Nicolas George [Thu, 20 Dec 2012 15:38:53 +0000 (16:38 +0100)]
lavfi/af_aconvert: update audio->channels.

6 years agotiffdec: support LZW compression with inverted FillOrder
Piotr Bandurski [Thu, 20 Dec 2012 15:36:44 +0000 (15:36 +0000)]
tiffdec: support LZW compression with inverted FillOrder

6 years agolavf/srtdec: reindent after previous commits.
Clément Bœsch [Thu, 20 Dec 2012 01:36:52 +0000 (02:36 +0100)]
lavf/srtdec: reindent after previous commits.

6 years agolavf/srtenc: honor subtitle position side data.
Clément Bœsch [Fri, 30 Nov 2012 23:35:01 +0000 (00:35 +0100)]
lavf/srtenc: honor subtitle position side data.

6 years agolavf/srtdec: switch to FFDemuxSubtitlesQueue API.
Clément Bœsch [Fri, 30 Nov 2012 18:39:11 +0000 (19:39 +0100)]
lavf/srtdec: switch to FFDemuxSubtitlesQueue API.

6 years agolavf: split packets before muxing.
Clément Bœsch [Mon, 3 Dec 2012 22:13:53 +0000 (23:13 +0100)]
lavf: split packets before muxing.

After demuxing, data and side are merged. Before decoding, they are
split. Encoder will perform with data and side split. This means that a
muxer can receive split data (after encoding) but also merged data (if
called directly after demuxing). This commit makes sure data and side
are split for the muxer.

6 years agoaiffenc: set correct number of bits foru8 in aiff
Piotr Bandurski [Wed, 12 Dec 2012 20:51:30 +0000 (21:51 +0100)]
aiffenc: set correct number of bits foru8 in aiff

with this change QuickTime is able to play u8 aiff file generated by FFmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: add missing files for arm
Luca Barbato [Thu, 20 Dec 2012 13:07:23 +0000 (14:07 +0100)]
lavc: add missing files for arm

Across the many retouches those did not make the main commit.

6 years agolavc: introduce VideoDSPContext
Ronald S. Bultje [Sat, 15 Dec 2012 17:46:02 +0000 (09:46 -0800)]
lavc: introduce VideoDSPContext

Move some functions from dsputil. The idea is that videodsp contains
functions that are useful for a large and varied set of video decoders.
Currently, it contains emulated_edge_mc() and prefetch().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agortp: Don't read priv_data unless it is allocated
Martin Storsjö [Thu, 20 Dec 2012 11:53:27 +0000 (13:53 +0200)]
rtp: Don't read priv_data unless it is allocated

This makes all users of rtpenc_chain (rtsp muxer, sapenc, mov
rtp hinting) work again, broken since 8034130e0.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi: remove init and check of rate and layout.
Nicolas George [Sun, 2 Dec 2012 15:34:17 +0000 (16:34 +0100)]
lavfi: remove init and check of rate and layout.

The sample rate and channel layout are negotiated and set
by the filter graph system.

6 years agolavfi/buffersrc: remove init of rate and layout.
Nicolas George [Sun, 2 Dec 2012 15:32:29 +0000 (16:32 +0100)]
lavfi/buffersrc: remove init of rate and layout.

The sample rate and channel layout are negotiated and set
by the filter graph system, the filters must not set them.

6 years agolavfi: add an accessor for ref->audio->channels.
Nicolas George [Sun, 2 Dec 2012 15:39:41 +0000 (16:39 +0100)]
lavfi: add an accessor for ref->audio->channels.

6 years agolavfi: add a channels field to AVFilterLink.
Nicolas George [Sun, 2 Dec 2012 15:31:15 +0000 (16:31 +0100)]
lavfi: add a channels field to AVFilterLink.

Also: fix af_pan and af_aresample, that forgot to update
audio->channels.

6 years agoh264: Fix code to also handle pix format changes.
Michael Niedermayer [Thu, 20 Dec 2012 11:52:16 +0000 (12:52 +0100)]
h264: Fix code to also handle pix format changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Dec 2012 11:18:28 +0000 (12:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: add option for dithering during sample format conversion to s16
  mpeg12: do not decode extradata more than once.

Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
Michael Niedermayer [Thu, 20 Dec 2012 11:06:15 +0000 (12:06 +0100)]
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
  cmdutils: pass number of groups to split_commandline().
  mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflvenc: Check whether seeking back to the header succeeded
Björn Axelsson [Thu, 13 Dec 2012 13:48:25 +0000 (14:48 +0100)]
flvenc: Check whether seeking back to the header succeeded

The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seeking to the header fails.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosapenc: Pass the title on to the chained muxers
Jernej Virag [Mon, 17 Dec 2012 09:04:15 +0000 (10:04 +0100)]
sapenc: Pass the title on to the chained muxers

This makes sure it ends up in the SDP, providing a proper session name
in the SAP announcements.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/select: fix compilation with avcodec disabled.
Clément Bœsch [Thu, 20 Dec 2012 04:17:17 +0000 (05:17 +0100)]
lavfi/select: fix compilation with avcodec disabled.

6 years agoastenc: Remove two AVRationals with denominator 1
James Almer [Wed, 19 Dec 2012 00:48:06 +0000 (21:48 -0300)]
astenc: Remove two AVRationals with denominator 1

They are completely superfluous when using av_rescale_q_rnd().
Call av_rescale_rnd() using what used to be the numerators instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove unused variable
Michael Niedermayer [Thu, 20 Dec 2012 03:22:21 +0000 (04:22 +0100)]
h264: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: fix pointer types
Michael Niedermayer [Thu, 20 Dec 2012 03:21:29 +0000 (04:21 +0100)]
ffmpeg_opt: fix pointer types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: increase scratchpad sizes
Michael Niedermayer [Thu, 20 Dec 2012 02:53:27 +0000 (03:53 +0100)]
mpegvideo: increase scratchpad sizes

These where reduced in f1d8763a02b5fce9a7d9789e049d74a45b15e1e8
and this change can cause out of array accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/general: sort subtitles formats.
Clément Bœsch [Thu, 20 Dec 2012 02:55:16 +0000 (03:55 +0100)]
doc/general: sort subtitles formats.

6 years agofate: add and fix subtitles dependencies.
Clément Bœsch [Thu, 20 Dec 2012 02:48:02 +0000 (03:48 +0100)]
fate: add and fix subtitles dependencies.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Dec 2012 01:51:35 +0000 (02:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: increase edge_emu_buffer size for VC1
  lavc: merge latest x86inc.asm fixes with x264

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'acb571c89a065d943163c11efb46de35774f1909'
Michael Niedermayer [Thu, 20 Dec 2012 01:44:22 +0000 (02:44 +0100)]
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'

* commit 'acb571c89a065d943163c11efb46de35774f1909':
  avcodec: bump minor for adaptive h264 frame-mt
  avconv: pass the actually selected decoder to filter_codec_opts().

Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: implement debug/fdebug log level update differently.
Michael Niedermayer [Thu, 20 Dec 2012 01:15:40 +0000 (02:15 +0100)]
cmdutils: implement debug/fdebug log level update differently.

The old implementation is no longer possibly due to limitations
of the new command line parser.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
Michael Niedermayer [Thu, 20 Dec 2012 01:38:02 +0000 (02:38 +0100)]
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
  avconv: use new options parser.

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c

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