virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
27,532 Commits 37 Branches 400 Tags 464 MiB
bffad70c66
Commit Graph

27532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mans Rullgard
c7892b418b Fix libavformat version extraction in configure 
This fixes shared library builds broken by
50196a982b

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4ad66441c9)
 2011-01-23 19:32:07 +01:00
Mans Rullgard
727a20cb60 configure: better test for mktemp 
Some variants of mktemp require a template, so provide one when
checking for the command.  We already supply a template in the
subsequent uses of mktemp.

Thanks to Michael Kostylev.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a210bce298)
 2011-01-23 19:32:06 +01:00
Mans Rullgard
3df0297567 configure: simplify exit traps 
This does the same thing and also fixes the trapping in
some (possibly broken) shells.

Suggested by Michael Kostylev.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 93bb9ff08e)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
6e89b61293 lavf: move ff_put_str16_nolen from asf to avio and rename it 
It will be useful in the mp3 muxer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dccbd97d72)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
e910a77b0d avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4efd5cf34b)
 2011-01-23 19:32:06 +01:00
Justin Ruggles
384dbd617f cosmetics related to LPC changes. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1c189fc533)
 2011-01-23 19:32:06 +01:00
Justin Ruggles
7101b18508 Separate window function from autocorrelation. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 77a78e9bdc)
 2011-01-23 19:32:06 +01:00
Justin Ruggles
0d8837bdda Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 56f8952b25)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
d3058be6ee lavf: move the version macros to a new header 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 50196a982b)
 2011-01-23 19:32:06 +01:00
Michael Niedermayer
002bd34603 Fix out of source tree builds of libmpcodecs. 2011-01-23 16:58:32 +01:00
Anton Khirnov
eeb0b893e3 id3v2: use an enum for encodings instead of magic numbers. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d66eff3685)
 2011-01-21 20:36:01 +01:00
Mans Rullgard
a091006d3d Make demuxers auto-select parsers they need 
This makes configure --disable-everything --enable-demuxer=foo
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit c2dd0e9eba)
 2011-01-21 20:36:01 +01:00
Mans Rullgard
d094258f81 Makefile: simplify setting of some variables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 583fcb528c)
 2011-01-21 20:36:01 +01:00
Anton Khirnov
baa69f8a84 Split mp3 demuxer and muxer into separate files. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d08928bbea)
 2011-01-21 20:36:01 +01:00
Mans Rullgard
cafa3edada dca: pretty-print some tables 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2611e52088)
 2011-01-21 20:36:01 +01:00
Justin Ruggles
a994f86196 iir: change filter type if/else to a switch. 
Simplifies error handling and makes it easier to add additional filter types.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 0361d13cf3)
 2011-01-21 20:36:01 +01:00
Justin Ruggles
aa226b2460 Add biquad high-pass and low-pass IIR filters. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fcdf0a43cd)
 2011-01-21 20:36:01 +01:00
Ronald S. Bultje
7f8c11b005 Set gray (128) U/V planes for chroma-less samples. Fixes two fate samples 
when played with -flags emu_edge.
(cherry picked from commit 8bcfe7f7fd)
 2011-01-21 20:36:01 +01:00
Ronald S. Bultje
772225c041 Revert 2a1f431d38, it broke H264 lossless. 
(cherry picked from commit 66c6b5e2a5)
 2011-01-21 20:36:01 +01:00
Justin Ruggles
2293b0b698 Split out Butterworth filter coeff init to a separate function. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 30112adadf)
 2011-01-21 20:36:01 +01:00
Justin Ruggles
99c2111b12 cosmetics: vertical alignment and line wrap 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75b98610a7)
 2011-01-21 20:36:01 +01:00
Justin Ruggles
20d1f6fec1 Add memory allocation failure checks to ff_iir_filter_init_coeffs(). 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d42dc217ed)
 2011-01-21 20:36:01 +01:00
Mans Rullgard
bb71141450 Make PNG test depend on PNG codec 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f0f54c297f)
 2011-01-21 20:36:00 +01:00
Justin Ruggles
7891fdcc03 cosmetics: wrap long line 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ebb230279a)
 2011-01-21 20:36:00 +01:00
Justin Ruggles
b3b8b930fc Add function ff_iir_filter_flt() to accept floating-point input and output. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 0a3d7697b4)
 2011-01-21 20:36:00 +01:00
Janne Grunau
236bb68d76 mpegtsenc: prefer metadata keyed with "service_name" 
title metadata is only used as fallback if no service_name is available.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e5fe65512b)
 2011-01-21 20:36:00 +01:00
Georgi Chorbadzhiyski
d7b219ca96 Set service_provider and service_name in mpegts demuxer 
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e8315e7881)
 2011-01-21 20:36:00 +01:00
Anton Khirnov
d4cc1f5b97 id3v2: don't overwrite existing tags 
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.

fixes issue2419

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75aded8328)
 2011-01-21 20:36:00 +01:00
Anton Khirnov
189665d927 id3v2: convert metadata after all the tags were read 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f7fcd6a254)
 2011-01-21 20:36:00 +01:00
Anton Khirnov
b3158f7a42 id3v2: make ff_id3v2_parse static 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 46a2da7698)
 2011-01-21 20:36:00 +01:00
Georgi Chorbadzhiyski
9256dc28ab libavcodec minor version is > 99 so fix the formating 
libavcodec minor version is > 99 so when printing the library versions
the output is a little bit broken:

  libavutil    50. 36. 0 / 50.36. 0
  libavcore     0. 16. 1 /  0.16. 1
  libavcodec   52.108. 0 / 52.108. 0
  libavformat  52. 94. 0 / 52.94. 0
  libavdevice  52.  2. 3 / 52. 2. 3
  libavfilter   1. 74. 0 /  1.74. 0
  libswscale    0. 12. 0 /  0.12. 0

Change the formating to look like this:

  libavutil    50. 36. 0 / 50. 36. 0
  libavcore     0. 16. 1 /  0. 16. 1
  libavcodec   52.108. 0 / 52.108. 0
  libavformat  52. 94. 0 / 52. 94. 0
  libavdevice  52.  2. 3 / 52.  2. 3
  libavfilter   1. 74. 0 /  1. 74. 0
  libswscale    0. 12. 0 /  0. 12. 0

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit c0dd565304)
 2011-01-21 20:36:00 +01:00
Georgi Chorbadzhiyski
7916202b97 Add service_provider and service_name metadata 
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.

Example usage:
   ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
       -metadata service_provider="Some provider" \
       -metadata service_name="Some Channel" \
       "udp://239.0.70.2:5000?pkt_size=1316&ttl=1"

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69688e71bc)
 2011-01-21 20:35:46 +01:00
Ronald S. Bultje
e25f19a113 Fix horizontal/horizontal_up 8x8l intra prediction x86/simd functions. 
The original functions did not work correctly for edge pixels, e.g.
when CODEC_FLAG_EMU_EDGE is set, leading to corrupt output in e.g. VLC.
Based on a patch by Daniel Kang <daniel d kang gmail com>.

Signed-off-by: Ronald S. Bultje <rsbultje gmail com>
(cherry picked from commit b9c7f66e6d)
 2011-01-21 20:35:46 +01:00
Justin Ruggles
f32e646d82 Fix use of sstep/dstep in ff_iir_filter(). 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit c3897d7690)
 2011-01-21 20:35:45 +01:00
Justin Ruggles
024f63709d Add regression test for stereo s16le in voc. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a4f5af13fb)
 2011-01-21 20:35:45 +01:00
Mans Rullgard
ef44b5bf19 configure: fix mktemp test and fallback function 
(cherry picked from commit 09a5c2452c)
 2011-01-21 20:35:45 +01:00
Michael Niedermayer
3b63a52207 Add GPL dependancy for libmpcodecs 2011-01-21 14:12:09 +01:00
Michael Niedermayer
61d7f8fed4 Warn about vf_mp 2011-01-20 03:27:01 +01:00
Michael Niedermayer
fd4c59b519 Enable libmpcodecs support. 2011-01-20 03:27:01 +01:00
Michael Niedermayer
a61b0df708 Add ASMALIGN() hack to patch around its recent removial from configure 2011-01-20 03:27:01 +01:00
Michael Niedermayer
3aa43978da Add libmpcodecs wrapper for libavfilter, still disabled 2011-01-20 03:26:54 +01:00
Michael Niedermayer
3be78f7ecd Hack libmpcodecs to make it buildable. 2011-01-20 00:59:30 +01:00
Michael Niedermayer
8e45c103e9 Remove dependancy of m_option & m_struct from libmpcodecs. 2011-01-20 00:57:33 +01:00
Michael Niedermayer
4d46361425 Avoid dependancy on global variable verbose in libmpcodecs/vf_pullup.c 2011-01-20 00:52:26 +01:00
Michael Niedermayer
45c889a3ad Add #define _BSD_SOURCE where mplayer is not C99. 2011-01-20 00:50:42 +01:00
Michael Niedermayer
e4852fb38d Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
Michael Niedermayer
fe67841355 Revert "Update git-howto with ffmpeg.org URLs" 
This reverts commit 69c92320d7.

Reason is that this has been commited by mistake as discussed.
 2011-01-19 19:06:32 +01:00
Michael Niedermayer
111ccca602 Revert "Initial MAINTAINERS update" 
This reverts commit f4f5cab94e.

Reason is that this has been mistakely commited as discussed.
 2011-01-19 18:53:53 +01:00
Mans Rullgard
44caaa560b ARM: improve VFP ABI check 
Recent gcc versions define __ARM_PCS or __ARM_PCS_VFP to indicate the
VFP ABI in use, and ARM RVCT defines __SOFTFP__ when using this ABI.
If none of these are defined, check $cross_prefix and $cc for the
substring "hardfloat", and finally fall back to a linker test.  This
gives the correct result in most configurations.
 2011-01-18 20:48:25 +00:00
Mans Rullgard
b0c1b66a4b armcc: suppress warning about hardfp compatibility 2011-01-18 20:48:25 +00:00