RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
43,109 Commits 37 Branches 400 Tags 241 MiB
2702e38477
Commit Graph

43109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
2702e38477 lavfi: remove unused defaults.c file 2012-08-01 11:05:41 +02:00
Nicolas George
6eee9f5596 8svx: ensure that packet size is multiple of channels. 
Fix an assert failure with packets of invalid size.
 2012-08-01 10:29:10 +02:00
Carl Eugen Hoyos
d1ebb25ac6 Skip chan tag padding. 
Fixes ticket #1580
 2012-08-01 08:33:18 +02:00
Paul B Mahol
296bcdd2a7 paf: use reget_bufer() instead of get_buffer() 
Pallete is written to frame->data[1] only if it changes.
This fixes PAL8->PAL8 transcoding.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-01 03:16:55 +00:00
Paul B Mahol
c36bad3b89 xvma: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-08-01 03:15:32 +00:00
Michael Niedermayer
b0c51bbcd1 h264_mc_template: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-01 04:19:46 +02:00
Michael Niedermayer
38d1c5a4cc g722enc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-01 04:19:27 +02:00
Michael Niedermayer
d57a9928ea ffmpeg: avoid bogus error with "test.flac -c copy -f null -" 
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-01 01:47:51 +02:00
Michael Niedermayer
d1dad7c824 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpc8: return more meaningful error codes.
  mpc: return more meaningful error codes.
  wv,mpc8: don't return apetag data in packets.
  rtmp: do not warn about receiving metadata packets
  x86: h264dsp: Adjust YASM #ifdefs
  x86: yadif: Mark mmxext optimizations as such
  h264: convert loop filter strength dsp function to yasm.
  Improve descriptiveness of a number of codec and container long names

Conflicts:
	libavcodec/flvdec.c
	libavcodec/libopenjpegdec.c
	libavformat/apetag.c
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-31 22:41:00 +02:00
Anton Khirnov
f2ed006c90 mpc8: return more meaningful error codes. 2012-07-31 20:54:22 +02:00
Anton Khirnov
263dbe9d95 mpc: return more meaningful error codes. 2012-07-31 20:54:17 +02:00
Anton Khirnov
782e64fbe1 wv,mpc8: don't return apetag data in packets. 2012-07-31 20:53:54 +02:00
Nicolas George
d2ca5dd0f3 loco: fix return value. 
The return value was the number of bytes left,
it is supposed to be the number of bytes used.
 2012-07-31 17:25:42 +02:00
Nicolas George
91ec1c6cc3 loco: take decode overflow into account. 
Commit 2bf0982 introduced an overflow check in loco_decode_plane,
but the error code is never taken into account, leading to
completely idiotic return values.
 2012-07-31 17:25:36 +02:00
Nicolas George
b2814b034e sp5xdec: sanitize return value. 
i is the decoded size of a recoded packet, which is larger
than the original packet. Assume that if decoding succeeded,
all the packet was used.
 2012-07-31 17:23:32 +02:00
Nicolas George
7a539e67f4 8svx: unify mono and stereo code paths. 2012-07-31 17:23:31 +02:00
Nicolas George
5caea648d4 8svx: remove useless rounding code. 
samples_size and samples_idx are supposed to be multiple of
channels at all time. If they are, the division is exact;
if they are not, something is very wrong in the code.
 2012-07-31 17:23:31 +02:00
Nicolas George
1c98781837 8svx: use a more direct condition. 
esc->table was inited based on codec->id: re-testing codec->id
is code duplication and can lead to inconsistencies.
 2012-07-31 17:23:31 +02:00
Nicolas George
9009fa6de4 movtextdec: fix return value for too small packets. 2012-07-31 17:23:31 +02:00
Nicolas George
3d5dc7d87d mmvideo: count preamble size in return value. 
MM_PREAMBLE_SIZE is subtracted from buf_size almost immediately.
The original size is still in avpkt->size.
 2012-07-31 17:22:23 +02:00
Nicolas George
cc7eff1fa0 vc1dec: count ENDOFSEQ code in return value. 2012-07-31 17:17:38 +02:00
Nicolas George
89898cd3b6 ffprobe: fix validity error with tags and data. 
Add "data" and "extradata" attributes to the schema.
Add "tag" element in "streams".
Print extradata before tags to avoid closing the element.

Fix trac ticket #1588.
 2012-07-31 15:06:57 +02:00
Samuel Pitoiset
9c9c21eaa1 rtmp: do not warn about receiving metadata packets 
They are managed in get_packet()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-31 14:52:25 +02:00
Diego Biurrun
8728b381cb x86: h264dsp: Adjust YASM #ifdefs 
This fixes compilation with YASM disabled.
 2012-07-31 13:54:07 +02:00
Diego Biurrun
d1505db067 x86: yadif: Mark mmxext optimizations as such 
The yadif mmx optimizations contain the pmaxsw and pmaxub mmxext
instructions, causing sigills on CPUs that do not support mmxext.
 2012-07-31 13:54:06 +02:00
Stefano Sabatini
52bd9cb4d2 lavfi/movie: force channel layout if not set by the decoder 
This ensures that the output buffers will have the channel layout set,
which is required by filters.

Also consistent with ffmpeg.c behavior.
 2012-07-31 13:25:14 +02:00
Stefano Sabatini
c809b89a12 ffprobe: show audio frame channels and channel_layout 2012-07-31 13:21:29 +02:00
Stefano Sabatini
23fc4dd6e7 lavc: add channels field to AVFrame 
This is required otherwise it is not always possible to guess the number
of channels from the layout, for example if the channel layout is
unknown.
 2012-07-31 13:21:10 +02:00
Stefano Sabatini
b4c3359828 lavfi/asettb: do not create a new reference in filter_samples() 
There is no need to duplicate the input reference, since a filter should
not pass along a reference which is later modified. If this happens the
filter passing the reference should be fixed.

Also improve consistency with start_frame() of settb, allowing a pending
factorization.
 2012-07-31 13:15:51 +02:00
Stefano Sabatini
a7c3720e87 lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values 
The documentation was erroneously removed in 7cf9aadd.
 2012-07-31 13:15:43 +02:00
Ronald S. Bultje
b829b4ce29 h264: convert loop filter strength dsp function to yasm. 
This completes the conversion of h264dsp to yasm; note that h264 also
uses some dsputil functions, most notably qpel. Performance-wise, the
yasm-version is ~10 cycles faster (182->172) on x86-64, and ~8 cycles
faster (201->193) on x86-32.
 2012-07-30 19:39:47 -07:00
Michael Niedermayer
00ddf62078 mpegdemux: Fix probing of unrecognized_mpeg_video.mpg 
Fixes Ticket1586

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-31 03:59:29 +02:00
Michael Niedermayer
3b5ba60aa7 vc1dec: fix handling of max_coded dimensions 
Fixes Ticket1502

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-31 03:00:35 +02:00
Michael Niedermayer
30c8573dc7 mpeg4videoenc: ensure SAR is within the supported range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-31 01:57:18 +02:00
Michael Niedermayer
b5da7d4c1a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avformat: Drop pointless "format" from container long names
  swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
  wv: K&R formatting cosmetics
  configure: Add missing descriptions to help output
  h264_ps: declare array of colorspace strings on its own line.
  fate: amix: specify f32 sample format for comparison
  tiny_psnr: support 32-bit float samples
  eamad/eatgq/eatqi: call special EA IDCT directly
  eamad: remove use of MpegEncContext
  mpegvideo: remove unnecessary inclusions of faandct.h
  af_asyncts: avoid overflow in out_size with large delta values
  af_asyncts: add first_pts option

Conflicts:
	configure
	libavcodec/eamad.c
	libavcodec/h264_ps.c
	libavformat/crcenc.c
	libavformat/ffmdec.c
	libavformat/ffmenc.c
	libavformat/framecrcenc.c
	libavformat/md5enc.c
	libavformat/nutdec.c
	libavformat/rawenc.c
	libavformat/yuv4mpeg.c
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 23:28:31 +02:00
Diego Biurrun
0177b7d23a Improve descriptiveness of a number of codec and container long names 2012-07-30 20:46:55 +02:00
Nicolas George
a85b4a5696 lavfi: use correct PTS for link age. 
When start_frame has returned, the buffer reference's PTS
may have been modified by another filter.
 2012-07-30 17:56:26 +02:00
Michael Niedermayer
64f07754fe buildsys: fix c++ compilation 
Based on code by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 17:51:33 +02:00
Michael Niedermayer
64a2c51f7b fate: fix forgotten hunk for framerate order change in ffmpeg.c 
broken by: cbb2c95e47
i had fixed that commit but pushed from an old branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 17:51:33 +02:00
Michael Niedermayer
3161958455 yadif: update frame rate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 14:17:10 +02:00
Michael Niedermayer
cbb2c95e47 ffmpeg: init simple filter graph before trying to extract framerate from its output. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 14:17:10 +02:00
Michael Niedermayer
dfd8f2ff19 avfilter: fix minor typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 14:17:10 +02:00
Diego Biurrun
6774247a9d avformat: Drop pointless "format" from container long names 2012-07-30 13:59:06 +02:00
Nicolas George
f893904469 audioconvert: add av_get_standard_channel_layout(). 
Also bump minor version and add APIchanges entry.
 2012-07-30 11:38:38 +02:00
Nicolas George
33449b1776 audioconvert: add av_get_channel_description(). 2012-07-30 11:37:40 +02:00
Nicolas George
cc55470472 audioconvert: include the description of channels in the library. 2012-07-30 10:24:37 +02:00
Paul B Mahol
8a6d673eff flacdec: fix memleaks 
While here refactor code.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-30 02:45:21 +00:00
jamal
753a1b0988 samplefmt: Fix warning about discarded qualifier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 03:50:43 +02:00
jamal
938e4470ae options: Fix warning about incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-30 03:48:46 +02:00
Ronald S. Bultje
8e5d71d110 swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. 2012-07-29 17:14:48 -07:00