ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master' n0.12-dev
Michael Niedermayer [Fri, 25 May 2012 18:48:50 +0000 (20:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
  imc: some cosmetics
  rtmp: Pass the proper return code in rtmp_handshake
  rtmp: Check return codes of net IO operations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.
Alex Converse [Wed, 23 May 2012 18:32:52 +0000 (11:32 -0700)]
movenc: Don't write the 'wave' atom or its child 'enda' for lpcm audio.

It's left over from stsd v0. QuickTime 7 no longer writes 'wave' or 'enda'
when 'lpcm' is the audio tag.

7 years agoimc: some cosmetics
Kostya Shishkov [Tue, 22 May 2012 17:45:00 +0000 (19:45 +0200)]
imc: some cosmetics

7 years agolibavfilter: export ff_default_query_formats()
Michael Niedermayer [Fri, 25 May 2012 16:54:01 +0000 (18:54 +0200)]
libavfilter: export ff_default_query_formats()

Its needed for fate on shared versioned .so

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorelease_notes: update
Michael Niedermayer [Fri, 25 May 2012 15:27:40 +0000 (17:27 +0200)]
release_notes: update

Note, if you want something mentioned in the release notes for 0.11
push it but be real quick ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "removing lowres support"
Michael Niedermayer [Fri, 25 May 2012 10:35:42 +0000 (12:35 +0200)]
Revert "removing lowres support"

There have been multiple user complaints about loosing this feature
while its not clear the 3% speedloss claims where real or fabricated.
My own testing indicates no statistically significant speed difference
both with mpeg2 and mpeg4, and if at all the code with lowres support
is a tiny bit faster than without.

This reverts commit 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476, reversing
changes made to 2e07f42957666df6d7c63a62263b8447e97b1442.

Conflicts:

cmdutils.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavutil/arm/Makefile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavdevice: bump soname due to lavf soname bump
Michael Niedermayer [Fri, 25 May 2012 10:22:21 +0000 (12:22 +0200)]
avdevice: bump soname due to lavf soname bump

avdevice is just a part of lavf and uses lavf API/ABI/structures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/pixdesctest: use AVPALETTE_SIZE macro
Stefano Sabatini [Fri, 25 May 2012 09:16:40 +0000 (11:16 +0200)]
lavfi/pixdesctest: use AVPALETTE_SIZE macro

7 years agolavfi/pixdesctest: fix SAME -> SAME memcpy
Stefano Sabatini [Fri, 25 May 2012 01:03:38 +0000 (03:03 +0200)]
lavfi/pixdesctest: fix SAME -> SAME memcpy

Fix pixdesctest output with pal8 input.

X-Cola-Count: +(10+i*PI)l

7 years agolavfi/hflip: copy palette data in start_frame()
Stefano Sabatini [Sat, 7 Apr 2012 07:57:07 +0000 (09:57 +0200)]
lavfi/hflip: copy palette data in start_frame()

Fix trac ticket #1116.

7 years agolavfi/aresample: print channel layouts and formats along with the rate.
Clément Bœsch [Thu, 24 May 2012 22:07:40 +0000 (00:07 +0200)]
lavfi/aresample: print channel layouts and formats along with the rate.

7 years agoFixed warnings about int64 to int32 conversion
Michael Bradshaw [Wed, 16 May 2012 17:39:20 +0000 (11:39 -0600)]
Fixed warnings about int64 to int32 conversion

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 24 May 2012 22:38:16 +0000 (00:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Return a proper error code instead of -1
  rtmp: Check malloc calls
  rtmp: Check ff_rtmp_packet_create calls
  lavfi: add audio mix filter
  flvdec: Make sure sample_rate is set to the updated value
  tqi: Pass errors from the MB decoder

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: move "aformat" before "amerge".
Clément Bœsch [Thu, 24 May 2012 21:55:17 +0000 (23:55 +0200)]
doc/filters: move "aformat" before "amerge".

7 years agodoc/filters: remove old aformat entry.
Clément Bœsch [Thu, 24 May 2012 21:54:04 +0000 (23:54 +0200)]
doc/filters: remove old aformat entry.

The new description is still available below.

7 years agolavfi/video: add avfilter.h include to fix make checkheaders.
Clément Bœsch [Thu, 24 May 2012 21:46:15 +0000 (23:46 +0200)]
lavfi/video: add avfilter.h include to fix make checkheaders.

7 years agoffmpeg: use AUTO_INSERT_FILTER() for -async option.
Clément Bœsch [Sat, 19 May 2012 18:08:25 +0000 (20:08 +0200)]
ffmpeg: use AUTO_INSERT_FILTER() for -async option.

7 years agoChangelog: update for 0.11
Michael Niedermayer [Thu, 24 May 2012 19:27:01 +0000 (21:27 +0200)]
Changelog: update for 0.11

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmp: Pass the proper return code in rtmp_handshake
Samuel Pitoiset [Thu, 24 May 2012 11:48:42 +0000 (13:48 +0200)]
rtmp: Pass the proper return code in rtmp_handshake

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortmp: Check return codes of net IO operations
Samuel Pitoiset [Thu, 24 May 2012 11:48:25 +0000 (13:48 +0200)]
rtmp: Check return codes of net IO operations

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMAINTAINERS: update versions
Michael Niedermayer [Thu, 24 May 2012 19:15:01 +0000 (21:15 +0200)]
MAINTAINERS: update versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)
Michael Niedermayer [Thu, 24 May 2012 19:07:14 +0000 (21:07 +0200)]
doc: remove ffmpeg-mt-authorship.txt from master (for upcoming 0.11)

This lists git history, which is better kept in the history itself
that is both ours as this file as well as the actual history of the
ffmpeg-mt project.
If someone thinks this is not ok, drop me a mail and ill put it back!

Also note this file was not carried in our previous release with noone
complaining

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: set base in dr1 allocation.
Michael Niedermayer [Thu, 24 May 2012 16:40:49 +0000 (18:40 +0200)]
ffplay: set base in dr1 allocation.

This matches the default non dr1 allocator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodshow: rename dshow.h to avoid conflict with system header of equal name
Kyle [Thu, 24 May 2012 11:59:33 +0000 (13:59 +0200)]
dshow: rename dshow.h to avoid conflict with system header of equal name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update checksum after pal8 changes
Michael Niedermayer [Thu, 24 May 2012 12:11:50 +0000 (14:11 +0200)]
fate: update checksum after pal8 changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoBuild the aformat filter when ffmpeg is built.
Carl Eugen Hoyos [Thu, 24 May 2012 10:26:31 +0000 (12:26 +0200)]
Build the aformat filter when ffmpeg is built.

7 years agoDo not disable ffmpeg with --disable-everything.
Carl Eugen Hoyos [Thu, 24 May 2012 06:14:48 +0000 (08:14 +0200)]
Do not disable ffmpeg with --disable-everything.

7 years agoFix compilation with --disable-everything.
Carl Eugen Hoyos [Thu, 24 May 2012 06:08:31 +0000 (08:08 +0200)]
Fix compilation with --disable-everything.

7 years agolavfutils: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:47:34 +0000 (21:47 +0200)]
lavfutils: fix copyright

git blame:
     77 Stefano Sabatini
      1 Michael Niedermayer

Initial commit:
commit 2f83681c79a7419bec14ed6f40bf3a69b5dd16c2
Author: Stefano Sabatini <stefasab@gmail.com>
Date:   Sat Mar 10 14:01:28 2012 +0100

    lavfi: port libmpcodecs remove-logo filter

    The code is based on the remove-logo filter in MPlayer/libmpcodecs, by
    Robert Edele, relicensed to LGPL with consent of the author.

    Address trac issue #249.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/video: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:44:31 +0000 (21:44 +0200)]
lavfi/video: fix copyright

git blame:
    132 Stefano Sabatini
     77 Vitor Sessak
     49 Michael Niedermayer
     24 Anton Khirnov
     22 S.N. Hemanth Meenakshisundaram
     13 Bobby Bingham
      7 Luca Barbato
      2 Nicolas George
      2 Alex Converse
      1 Diego Elio Pettenò

Initial commit not traced as this file was split out.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodrawutils: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:36:30 +0000 (21:36 +0200)]
drawutils: fix copyright

git blame:
    423 Nicolas George
     86 Stefano Sabatini
     19 Michael Niedermayer
      1 Reimar Döffinger

Initial commit:
commit bcfd9e821b6083e9a98b8e5da4de0a4fbf22923b
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date:   Sun Feb 20 23:42:17 2011 +0100

    lavfi: add drawutils

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fps: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:29:24 +0000 (21:29 +0200)]
vf_fps: fix copyright

Only commit:
commit 54c5dd89e3125c1f363fe8f95d2837a796967c6e
Author: Anton Khirnov <anton@khirnov.net>
Date:   Wed May 9 14:08:21 2012 +0200

    lavfi: Add fps filter.

    Partially based on a patch by Robert Nagy <ronag89@gmail.com>

also see [FFmpeg-devel] [PATCH 07/10] vf_fps: fix copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fps: license cleanup
Michael Niedermayer [Tue, 22 May 2012 19:27:54 +0000 (21:27 +0200)]
vf_fps: license cleanup

The original patch was sent with FFmpeg in the license header.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/buffer.c: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:19:24 +0000 (21:19 +0200)]
lavfi/buffer.c: fix copyright

git blame:
     75 Anton Khirnov
     72 Michael Niedermayer
     39 Stefano Sabatini
     23 S.N. Hemanth Meenakshisundaram
      9 Vitor Sessak
      6 Robert Nagy
      2 Diego Biurrun
      1 Andrey Utkin

Note:
commit ab165047a6142ca0c8c333c36f4ebb96477622d7
Author: Anton Khirnov <anton@khirnov.net>
Date:   Fri Apr 27 17:27:40 2012 +0200

    lavfi: add a function for copying properties from AVFilterBufferRef->AVFrame

    Based on a commit by Stefano Sabatini <stefano.sabatini-lala@poste.it>

commit 4a1ac8c43fcf526b249c3409f1ba54755143a224
Author: Anton Khirnov <anton@khirnov.net>
Date:   Thu May 10 07:58:11 2012 +0200

    lavfi: move buffer management function to a separate file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/avcodec.c: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:04:31 +0000 (21:04 +0200)]
lavfi/avcodec.c: fix copyright

git blame:
     45 Stefano Sabatini
     23 Clément Bœsch
      4 Michael Niedermayer
      3 Robert Nagy
      3 Nicolas George
      2 Roger Pau Monné

Initial commit:
commit 566666caf3a09d6254edaa99d222eddb6fe2986b
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date:   Sun May 1 14:47:05 2011 +0200

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasrc_anullsrc: fix copyright
Michael Niedermayer [Tue, 22 May 2012 19:01:07 +0000 (21:01 +0200)]
asrc_anullsrc: fix copyright

git blame says:
    109 Stefano Sabatini
      7 Clément Bœsch
      2 Reimar Döffinger
      2 Michael Niedermayer
      1 Reinhard Tartler
      1 Mans Rullgard

Initial commit:
commit 1ee410f330d3b57b0ea1ccb915977f2ba4d99815
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date:   Sat Sep 25 01:56:58 2010 +0000

    Add asrc_anullsrc - null audio source.

    Based on a patch by "S.N. Hemanth Meenakshisundaram" smeenaks!ucsd!edu.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasink_anullsink: fix copyright
Michael Niedermayer [Tue, 22 May 2012 18:57:06 +0000 (20:57 +0200)]
asink_anullsink: fix copyright

git blame says authors are:
     19 S.N. Hemanth Meenakshisundaram
      2 Reimar Döffinger

initial commit:
commit f0a5543898dad040b8f2d1b44fb6b278c06c3460
Author: S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu>
Date:   Sat Sep 25 01:57:01 2010 +0000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_null: fix copyright
Michael Niedermayer [Tue, 22 May 2012 18:50:43 +0000 (20:50 +0200)]
af_null: fix copyright

Authors according to blame are:
     16 S.N. Hemanth Meenakshisundaram
      4 Stefano Sabatini
      3 Anton Khirnov
      2 Reimar Döffinger

Initial commit was:
commit 99046339fca92d631404b47b041e98afa28659ed
Author: S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu>
Date:   Fri Aug 20 23:16:51 2010 +0000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: copy palette in start_frame()
Stefano Sabatini [Sat, 7 Apr 2012 07:49:39 +0000 (09:49 +0200)]
lavfi: copy palette in start_frame()

Fix -vf copy with pal8 format.

7 years agolavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h
Stefano Sabatini [Tue, 10 Apr 2012 14:34:16 +0000 (16:34 +0200)]
lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h

Move AVPALETTE_SIZE and AVPALETTE_COUNT definition from
libavcodec/avcodec.h to libavutil/pixfmt.h.

The definition is more useful in libavutil, where it can be shared for
example by libavfilter and libswscale.

7 years agortmp: Return a proper error code instead of -1
Samuel Pitoiset [Wed, 23 May 2012 16:55:52 +0000 (18:55 +0200)]
rtmp: Return a proper error code instead of -1

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortmp: Check malloc calls
Samuel Pitoiset [Wed, 23 May 2012 16:55:34 +0000 (18:55 +0200)]
rtmp: Check malloc calls

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortmp: Check ff_rtmp_packet_create calls
Samuel Pitoiset [Wed, 23 May 2012 20:45:03 +0000 (22:45 +0200)]
rtmp: Check ff_rtmp_packet_create calls

Check malloc calls used by ff_rtmp_packet_create, unify error
handling and pass on error codes.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavfi: add audio mix filter
Justin Ruggles [Tue, 22 May 2012 01:27:59 +0000 (21:27 -0400)]
lavfi: add audio mix filter

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 May 2012 19:41:13 +0000 (21:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
  http: Add support for reading http POST reply headers
  http: Add http_shutdown() for ending writing of posts
  tcp: Allow signalling end of reading/writing
  avio: Add a function for signalling end of reading/writing
  lavfi: fix comment, audio is supported now.
  lavfi: fix incorrect comment.
  lavfi: remove avfilter_null_* from public API on next bump.
  lavfi: remove avfilter_default_* from public API on next bump.
  lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
  avfiltergraph: smarter sample format selection.
  avconv: rename transcode_audio/video to decode_audio/video.
  asyncts: reset delta to 0 when it's not used.
  x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
  dwt: return errors from ff_slice_buffer_init()

Conflicts:
ffmpeg.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_blackframe.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_showinfo.c
libavfilter/video.c
libavfilter/video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflvdec: Make sure sample_rate is set to the updated value
Martin Storsjö [Wed, 23 May 2012 13:28:25 +0000 (16:28 +0300)]
flvdec: Make sure sample_rate is set to the updated value

The sample_rate variable is used for checks for audio format
changes at the end of the function.

This fixes cases where the sample rate was set from the codec
id by flv_set_audio_codec (as for nellymoser 8 kHz/16 kHz),
so the value set to last_sample_rate wasn't equal to sample_rate
at this point. This caused the demuxer otherwise reports a spurious
change to 5512 Hz and back to the correct one.

Updating channels in the same way is only done for consistency.
Currently, flv_set_audio_codec doesn't update that value.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotqi: Pass errors from the MB decoder
Michael Niedermayer [Mon, 19 Dec 2011 03:13:37 +0000 (04:13 +0100)]
tqi: Pass errors from the MB decoder

This silences some valgrind warnings.
CC: libav-stable@libav.org
Fixes second half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit f85334f58e1286287d0547a49fa9c93b40cbf48f)

7 years agoavidec: simplify avi_read_idx1()
Michael Niedermayer [Wed, 23 May 2012 16:46:01 +0000 (18:46 +0200)]
avidec: simplify avi_read_idx1()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: discard 0 packets even for sample_size==0 NI
Michael Niedermayer [Wed, 23 May 2012 16:42:27 +0000 (18:42 +0200)]
avidec: discard 0 packets even for sample_size==0 NI

Fixes Ticket1332

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxsubdec: print frame size when too small
Michael Niedermayer [Wed, 23 May 2012 16:37:55 +0000 (18:37 +0200)]
xsubdec: print frame size when too small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: print the invalid tb in avpriv_set_pts_info()
Michael Niedermayer [Wed, 23 May 2012 14:46:39 +0000 (16:46 +0200)]
lavf: print the invalid tb in avpriv_set_pts_info()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoDo not leak extradata when encoding avui.
Carl Eugen Hoyos [Wed, 23 May 2012 14:48:40 +0000 (16:48 +0200)]
Do not leak extradata when encoding avui.

7 years agoavuienc: Use field_order to determine if a stream is interlaced.
Carl Eugen Hoyos [Wed, 23 May 2012 14:36:53 +0000 (16:36 +0200)]
avuienc: Use field_order to determine if a stream is interlaced.

7 years agoFix compilation with --disable-everything --enable-demuxer=ogg (--disable-yasm).
Carl Eugen Hoyos [Wed, 23 May 2012 14:09:48 +0000 (16:09 +0200)]
Fix compilation with --disable-everything --enable-demuxer=ogg (--disable-yasm).

7 years agoFix compilation with --disable-everything --enable-demuxer=flac (--disable-yasm).
Carl Eugen Hoyos [Wed, 23 May 2012 14:04:22 +0000 (16:04 +0200)]
Fix compilation with --disable-everything --enable-demuxer=flac (--disable-yasm).

7 years agoaf_amerge: compute output timestamp.
Nicolas George [Wed, 23 May 2012 11:14:27 +0000 (13:14 +0200)]
af_amerge: compute output timestamp.

Use the timestamps from the first input.

7 years agoaf_amerge: set samples rate in query_formats.
Nicolas George [Wed, 23 May 2012 10:58:15 +0000 (12:58 +0200)]
af_amerge: set samples rate in query_formats.

7 years agoffv1: fix decoder state_transition table
Michael Niedermayer [Wed, 23 May 2012 10:04:10 +0000 (12:04 +0200)]
ffv1: fix decoder state_transition table

This fixes a regression with ffv1.1 coder=1 decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoos_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
Dave Yeo [Wed, 23 May 2012 20:34:13 +0000 (13:34 -0700)]
os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodwt: use av_freep()
Michael Niedermayer [Tue, 22 May 2012 21:58:46 +0000 (23:58 +0200)]
dwt: use av_freep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 22 May 2012 21:40:58 +0000 (23:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dwt: check malloc calls
  ppc: Drop unused header regs.h
  af_resample: remove an extra space in the log output
  Convert vector_fmul range of functions to YASM and add AVX versions
  lavfi: add an audio split filter
  lavfi: rename vf_split.c to split.c

Conflicts:
doc/filters.texi
libavcodec/ppc/regs.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_split.c
libavfilter/split.c
libavfilter/version.h
libavfilter/vf_split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohttp: Add support for reading http POST reply headers
Samuel Pitoiset [Mon, 21 May 2012 09:27:10 +0000 (11:27 +0200)]
http: Add support for reading http POST reply headers

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohttp: Add http_shutdown() for ending writing of posts
Samuel Pitoiset [Mon, 21 May 2012 09:26:40 +0000 (11:26 +0200)]
http: Add http_shutdown() for ending writing of posts

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotcp: Allow signalling end of reading/writing
Samuel Pitoiset [Mon, 21 May 2012 09:24:55 +0000 (11:24 +0200)]
tcp: Allow signalling end of reading/writing

tcp_shutdown() isn't needed at the moment, but is added for
consistency to explain how the function is supposed to be used.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavio: Add a function for signalling end of reading/writing
Samuel Pitoiset [Mon, 21 May 2012 09:24:54 +0000 (11:24 +0200)]
avio: Add a function for signalling end of reading/writing

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavfi: fix comment, audio is supported now.
Anton Khirnov [Mon, 21 May 2012 17:33:35 +0000 (19:33 +0200)]
lavfi: fix comment, audio is supported now.

7 years agolavfi: fix incorrect comment.
Anton Khirnov [Mon, 21 May 2012 17:30:07 +0000 (19:30 +0200)]
lavfi: fix incorrect comment.

poll_frame()/request_frame() are used for audio too.

7 years agolavfi: remove avfilter_null_* from public API on next bump.
Anton Khirnov [Sat, 19 May 2012 08:37:56 +0000 (10:37 +0200)]
lavfi: remove avfilter_null_* from public API on next bump.

Those functions are only useful inside filters. It is better to not
support user filters until the API is more stable.

7 years agolavfi: remove avfilter_default_* from public API on next bump.
Anton Khirnov [Sat, 19 May 2012 08:37:56 +0000 (10:37 +0200)]
lavfi: remove avfilter_default_* from public API on next bump.

Those functions are only useful inside filters. It is better to not
support user filters until the API is more stable.

7 years agolavfi: deprecate default config_props() callback and refactor avfilter_config_links()
Mina Nagy Zaki [Thu, 4 Aug 2011 12:47:00 +0000 (15:47 +0300)]
lavfi: deprecate default config_props() callback and refactor avfilter_config_links()

Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.

Remove now empty defaults.c

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavfiltergraph: smarter sample format selection.
Anton Khirnov [Sat, 19 May 2012 07:19:41 +0000 (09:19 +0200)]
avfiltergraph: smarter sample format selection.

7 years agoavconv: rename transcode_audio/video to decode_audio/video.
Anton Khirnov [Fri, 18 May 2012 10:46:11 +0000 (12:46 +0200)]
avconv: rename transcode_audio/video to decode_audio/video.

Those functions do only decoding now, encoding is run from
poll_filters().

7 years agoasyncts: reset delta to 0 when it's not used.
Anton Khirnov [Tue, 22 May 2012 18:44:07 +0000 (20:44 +0200)]
asyncts: reset delta to 0 when it's not used.

Fixes an invalid write.

7 years agox86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
Justin Ruggles [Tue, 22 May 2012 01:21:36 +0000 (21:21 -0400)]
x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.

This is needed for older versions of yasm/nasm that do not support AVX.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoswr: check return value of swr_inject_silence/drop_output.
Michael Niedermayer [Tue, 22 May 2012 16:54:38 +0000 (18:54 +0200)]
swr: check return value of swr_inject_silence/drop_output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvorbis: only store version string if bitexact is not set.
Michael Niedermayer [Tue, 22 May 2012 15:18:39 +0000 (17:18 +0200)]
libvorbis: only store version string if bitexact is not set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: check count argument of realloc_audio()
Michael Niedermayer [Tue, 22 May 2012 15:15:07 +0000 (17:15 +0200)]
swr: check count argument of realloc_audio()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd Avid Meridien Uncompressed (AVUI) encoder.
Carl Eugen Hoyos [Tue, 22 May 2012 18:33:24 +0000 (20:33 +0200)]
Add Avid Meridien Uncompressed (AVUI) encoder.

7 years agomxfdec: fix frame height computation for mixed fields layout
Matthieu Bouron [Mon, 21 May 2012 11:05:01 +0000 (13:05 +0200)]
mxfdec: fix frame height computation for mixed fields layout

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_yadif: Fixed potential access violation on EOF.
Robert Nagy [Mon, 21 May 2012 22:14:48 +0000 (00:14 +0200)]
vf_yadif: Fixed potential access violation on EOF.

The correct invariant is (cur != NULL -> next != NULL). Not the other way around.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawdec: force timestamps from codec to be used
Michael Niedermayer [Mon, 21 May 2012 12:33:09 +0000 (14:33 +0200)]
rawdec: force timestamps from codec to be used

This fixes playback timing with at least m4v files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videoparser: support using timestamps from codec.
Michael Niedermayer [Mon, 21 May 2012 12:36:21 +0000 (14:36 +0200)]
mpeg4videoparser: support using timestamps from codec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: add needs_parsing type to enable codec TS use.
Michael Niedermayer [Mon, 21 May 2012 12:32:24 +0000 (14:32 +0200)]
avformat: add needs_parsing type to enable codec TS use.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: add parser flag to indicate that codec TS are the only available and should...
Michael Niedermayer [Mon, 21 May 2012 12:31:20 +0000 (14:31 +0200)]
avcodec: add parser flag to indicate that codec TS are the only available and should be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodwt: return errors from ff_slice_buffer_init()
Diego Biurrun [Tue, 22 May 2012 11:50:23 +0000 (13:50 +0200)]
dwt: return errors from ff_slice_buffer_init()

7 years agoshorten: fix lossy decoding
Paul B Mahol [Tue, 22 May 2012 11:56:18 +0000 (11:56 +0000)]
shorten: fix lossy decoding

Closes #1299, #1300 and #1301.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodwt: check malloc calls
Jordi Ortiz [Tue, 22 May 2012 11:18:17 +0000 (13:18 +0200)]
dwt: check malloc calls

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoppc: Drop unused header regs.h
Diego Biurrun [Mon, 21 May 2012 06:47:11 +0000 (08:47 +0200)]
ppc: Drop unused header regs.h

7 years agodoc: add syntax.texi file
Stefano Sabatini [Thu, 3 May 2012 13:14:14 +0000 (15:14 +0200)]
doc: add syntax.texi file

7 years agoaf_resample: remove an extra space in the log output
Justin Ruggles [Mon, 21 May 2012 18:59:56 +0000 (14:59 -0400)]
af_resample: remove an extra space in the log output

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 21 May 2012 21:53:39 +0000 (23:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dwt: K&R prettyprinting cosmetics
  Remove libnut wrapper
  fate: change name of FATE samples location environment variable
  avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
  http: Factorize the code by adding http_read_header()

Conflicts:
configure
doc/APIchanges
doc/fate.texi
libavcodec/dwt.c
libavcodec/dwt.h
libavformat/Makefile
libavformat/avformat.h
libavformat/libnut.c
libavformat/matroskaenc.c
libavformat/utils.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoConvert vector_fmul range of functions to YASM and add AVX versions
Kieran Kunhya [Fri, 20 Apr 2012 19:49:30 +0000 (14:49 -0500)]
Convert vector_fmul range of functions to YASM and add AVX versions

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoflvdec: reenable extradata passing code
Michael Niedermayer [Mon, 21 May 2012 18:21:55 +0000 (20:21 +0200)]
flvdec: reenable extradata passing code

This fixes passing junk in stream.
It should not have any user vissible effect.
We are discarding the new data in the decoder as no case is known
where it is needed but it causes problems if used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: add an audio split filter
Justin Ruggles [Mon, 21 May 2012 18:03:42 +0000 (14:03 -0400)]
lavfi: add an audio split filter

Based on current version of the asplit filter in FFmpeg written by
Stefano Sabatini and others.

7 years agolavfi: rename vf_split.c to split.c
Justin Ruggles [Mon, 21 May 2012 18:00:47 +0000 (14:00 -0400)]
lavfi: rename vf_split.c to split.c

This is in preparation for adding an audio split filter.

7 years agoaac: fix SCE in stereo case, this is surprisingly actually needed
Michael Niedermayer [Mon, 21 May 2012 13:38:41 +0000 (15:38 +0200)]
aac: fix SCE in stereo case, this is surprisingly actually needed

Fixes Ticket513

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacdec: print debug note when unexpected SCE/CPE is encountered
Michael Niedermayer [Mon, 21 May 2012 15:55:11 +0000 (17:55 +0200)]
aacdec: print debug note when unexpected SCE/CPE is encountered

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec: fix side data split with 0 sized packets
Michael Niedermayer [Mon, 21 May 2012 18:16:35 +0000 (20:16 +0200)]
libavcodec: fix side data split with 0 sized packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec: correct consumed bytes for decoders
Michael Niedermayer [Mon, 21 May 2012 18:12:46 +0000 (20:12 +0200)]
libavcodec: correct consumed bytes for decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: print more debug info for debug_pict_info
Michael Niedermayer [Mon, 21 May 2012 12:34:35 +0000 (14:34 +0200)]
mpeg4videodec: print more debug info for debug_pict_info

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