27295 Commits

Author SHA1 Message Date
e5fe65512b 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>
2011-01-20 15:28:32 +01:00
e8315e7881 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>
2011-01-20 13:42:27 +00:00
75aded8328 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>
2011-01-20 13:39:19 +00:00
f7fcd6a254 id3v2: convert metadata after all the tags were read
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 13:36:28 +00:00
46a2da7698 id3v2: make ff_id3v2_parse static
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 13:36:22 +00:00
c0dd565304 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>
2011-01-20 11:34:19 +00:00
69688e71bc 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>
2011-01-20 11:31:20 +00:00
b9c7f66e6d 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>
2011-01-19 20:34:42 -05:00
c3897d7690 Fix use of sstep/dstep in ff_iir_filter().
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-19 20:56:07 +00:00
a4f5af13fb Add regression test for stereo s16le in voc.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-19 12:51:42 +00:00
09a5c2452c configure: fix mktemp test and fallback function 2011-01-18 22:17:10 +00:00
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
b0c1b66a4b armcc: suppress warning about hardfp compatibility 2011-01-18 20:48:25 +00:00
5a92140b6e armcc: suppress 'assignment in condition' warning 2011-01-18 20:48:24 +00:00
3240b371f8 fate: simplify vp8 rules 2011-01-18 20:48:24 +00:00
a6e5d231e9 a64enc: make PixelFormat arrays const 2011-01-18 20:48:24 +00:00
ef4a65149d Replace ASMALIGN() with .p2align
This macro has unconditionally used .p2align for a long time and
serves no useful purpose.
2011-01-18 20:48:24 +00:00
ac3c9d0169 x86: remove VLA in ac3_downmix_sse 2011-01-18 20:48:24 +00:00
ee6184a8d9 regtest: add openssl to md5 alternatives 2011-01-18 20:48:24 +00:00
fb3c4ffc4b configure: make $TMPE executable
This is required on systems where the linker does not change
the permissions of an existing output file.
2011-01-18 20:48:24 +00:00
ec5f57192a cpu-test: include stdio.h only for test prog 2011-01-18 20:48:24 +00:00
fef2d66166 Use -Bsymbolic for shared libs only, not executables
Some linkers fail if this flag is used when creating an executable file.
Since the flag is meaningful only for shared libraries, dropping it from
the main link flags is correct.
2011-01-18 20:48:24 +00:00
324e7ee260 Use INFINITY and NAN macros instead of 1/0 and 0/0 2011-01-18 20:48:23 +00:00
f318ee3e37 Fix quoting in version.sh 2011-01-18 20:48:23 +00:00
daed21a17e avfilter: remove stray semicolon 2011-01-18 20:48:23 +00:00
69c92320d7 Update git-howto with ffmpeg.org URLs 2011-01-18 20:48:23 +00:00
2c3589bfda consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00
a5da3b040c Deprecate CREDITS
It's useless now that we've switched to git.
2011-01-18 11:20:17 -08:00
f4f5cab94e Initial MAINTAINERS update
Per http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2011-January/103440.html.
2011-01-18 11:05:51 -08:00
f61cbc22d3 Revise check for codec id in voc demuxer.
This fixes demuxing of packets that do not contain a codec tag and come before the codec_id has been set.
2011-01-18 13:07:17 -05:00
1ae02fe03b Fix bug in voc demuxer that was introduced in SVN r26309.
Fixes issue 2560.
2011-01-18 12:15:36 -05:00
d425a03b59 cosmetics: reindent 2011-01-18 11:40:13 -05:00
1360f07e22 Add check for changing number of channels in DCA.
Fixes issue 2505.
2011-01-18 11:30:33 -05:00
59e2118e97 Update threshold to detect real timebase for stream copy.
This may fix a bug where quicktime files use 1/600 timebase.
2011-01-18 16:04:33 +01:00
54bc640362 Missing parts of IVF muxer support. 2011-01-18 08:00:23 +01:00
d9c3e5f6d8 Feed the filter chain with the sample aspect ratio from the muxer or codec layer
like it has been done prior libavfilter.
2011-01-17 23:22:42 +01:00
ab03382fee Add my GPG fingerprint to MAINTAINERS 2011-01-17 23:51:11 +02:00
d72858f89f Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame(). 2011-01-17 22:31:11 +01:00
db323491cd update av_log_missing_feature() to git
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 22:13:50 +01:00
4a6a21f5e4 Change SVN to Git in configure
Changes "version from SVN" to "version from Git".

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 22:13:22 +01:00
8f83a3b054 Remove outcommented fossil code. 2011-01-17 22:04:06 +01:00
4aaeabcb6a Explain how to set up user name/email correctly for git. 2011-01-17 21:16:41 +01:00
326851b9bc Add muxer for IVF format. 2011-01-17 21:11:51 +01:00
b79c3df088 prevent integer overflow in calculating duration
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-01-17 17:05:58 +02:00
348b8218f7 convert svn:ignore properties to .gitignore files
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 15:50:14 +01:00
a1c68a438c Add instructions how to check out a specific svn revision with git
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 11:33:43 +01:00
ffe9fd253f rewrite git-howto for the no merge policy
Originally committed as revision 26400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-17 10:02:53 +00:00
3a45a3f3c1 Fix date and revision for lavc 52.104.
Originally committed as revision 26399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-17 09:17:19 +00:00
6ee99a7e13 VP3: remove an unnecessary static variable
Originally committed as revision 26398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-17 08:36:13 +00:00
013291501f Allocate last picture for 4xm pfrm if its not allocated.
Fixes segfault and issue2527

Originally committed as revision 26397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 22:08:34 +00:00