ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-05 12:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,336 Commits 37 Branches 400 Tags 496 MiB
754539a409
Commit Graph

34336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ruggles
4be1e1dfa7 mpegaudiodec: Skip only bad frames instead of the whole packet. 
On frame decoding failure, return an error if the frame is the same size as
the whole packet, otherwise just log an error message and return the number
of bytes consumed.
 2011-10-27 22:06:31 -04:00
Michael Niedermayer
8d4e44993a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: remove "legacy" mpegvideo decoder.
  iv8: assemble packets to return complete frames
  pulse: documentation
  pulse: introduce pulseaudio input
  remove the zork pcm seek test

Conflicts:
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c
	libavdevice/avdevice.h
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 03:05:16 +02:00
Stefano Sabatini
aa638b4600 rawdec: add check on sample_rate 
Prevent error condition in case sample_rate is unset or set to a negative
value. In particular, fix divide-by-zero error occurring in ffmpeg due to
sample_rate set to 0 in output_packet(), in code:

                ist->next_pts += ((int64_t)AV_TIME_BASE * ist->st->codec->frame_size) /
                    ist->st->codec->sample_rate;

Fix trac ticket #324.
 2011-10-28 02:06:50 +02:00
Stefano Sabatini
8dc90371b1 lavfi: add internal function ff_fill_rgba_map() 2011-10-28 02:06:50 +02:00
Hendrik Leppkes
b76bc01034 Implement parsing of the "HandlerName" from th MP4 HDLR atom. 
This atom typically is used for a track title.
(cherry picked from commit a356137816b4ea20a892d1fb203b11dbfedbc543)

Reviewed-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 01:37:50 +02:00
Yusuke Nakamura
05e417aa63 mov: Support empty first edit + normal second edit. 
(cherry picked from commit df342c91e6cfceb2537c2d1b2442dd685381a0ca)

Reviewed-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 01:37:50 +02:00
Michael Niedermayer
e7f008a534 lavc: Map deprecated codec ids to ours so as to maintain compatibility with the fork. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 01:37:50 +02:00
Michael Niedermayer
4f587d1637 avcodec: Change values of codec ids at the end of lists that dont exist outside ffmpeg yet so 
they wont conflict when they get added to the fork with randomly changed order and values.
Also add duplicate codec_ids to allow maintaining compatibility.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 01:37:50 +02:00
Michael Niedermayer
2179fc48b2 avcodec: Resolve the codec_id compatibility issue. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 01:37:50 +02:00
Hendrik Leppkes
dc38625ebc Add SMPTE240M transfer characteristics flag. 
(cherry picked from commit 4266191919c31a1921b497ec831d3b1c1fa28df8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 01:37:50 +02:00
Anton Khirnov
15946eb8a9 lavc: remove "legacy" mpegvideo decoder. 2011-10-27 23:06:26 +02:00
Clément Bœsch
9bd23f6815 ashowinfo: fix typo in description. 2011-10-27 22:16:24 +02:00
Clément Bœsch
a0b7853f7a vf_showinfo: print checksums in hexadecimal. 2011-10-27 22:14:57 +02:00
Michael Niedermayer
c643ba8128 mpegts: Fix detection of some raw AAC 
Fixes Ticket577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 21:40:05 +02:00
Michael Niedermayer
abe17c6963 j2kdec: debug markers support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 20:43:27 +02:00
Michael Niedermayer
c2553a5585 Merge remote-tracking branch 'luzero/pulse' 
* luzero/pulse:
  pulse: set the device from the avformat filename

Conflicts:
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 19:46:53 +02:00
Janne Grunau
cf543c6574 iv8: assemble packets to return complete frames 2011-10-27 18:47:34 +02:00
Michael Niedermayer
4ffed61b49 h264_parser: fully parse first_mb_in_slice to more reliably detect AU boundaries. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 17:53:29 +02:00
Michael Niedermayer
23040e2e3d h264: use long reading for first_mb_in_slice 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 17:53:08 +02:00
Michael Niedermayer
3e7db0a9ee resample: Fix array size 
Found-by: Jim Radford
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 15:27:32 +02:00
Michael Niedermayer
1b9ca38d9d resample2: fix potential overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 14:34:45 +02:00
Michael Niedermayer
a67cb012e6 resample: Fix overflow 
Found-by: Jim Radford
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 14:31:53 +02:00
Michael Niedermayer
3e4375833d vf_scale: Request an aligned buffer. 
Fixes Ticket594

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 03:46:50 +02:00
Michael Niedermayer
d7dcd96a23 vf_pad: Fix alignment of get_video_buffer() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 03:46:09 +02:00
Michael Niedermayer
d18fd13f30 avfilter: add named constamt to indicate the amount of alignment that AV_PERM_ALIGN means. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 03:45:02 +02:00
Michael Niedermayer
4d34b6c1a1 avfilter: add flag to indicate that alignment is needed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 03:44:41 +02:00
Luca Barbato
c4b97fbdfa pulse: documentation 
Specify avoptions and how to use pactl to list devices.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-10-26 16:39:33 -07:00
Luca Barbato
0de9c41ff4 pulse: introduce pulseaudio input 
It currently use the simple api and is using the latency information
provided only to offset the stream start.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-10-26 16:39:33 -07:00
Michael Niedermayer
173715d291 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  libopencore-amr: check output buffer size before decoding
  libopencore-amr: remove unneeded buf_size==0 check.
  libopencore-amr: remove unneeded frame_count field.
  aac_latm: remove unneeded check for zero-size packet.
  pcmdec: fix output buffer size check by calculating the actual output size prior to decoding.
  pcmdec: move codec-specific variable declarations to the corresponding codec blocks.
  pcmdec: return buf_size instead of src-buf.
  avcodec: remove the Zork PCM encoder.
  pcm_zork: use AV_SAMPLE_FMT_U8 instead of shifting all samples by 8.
  pcmenc: remove unneeded sample_fmt check.
  pcmdec: move number of channels check to pcm_decode_init()
  pcmdec: remove unnecessary check for sample_fmt change
  pcmdec: move DVD PCM bits_per_coded_sample check near to the code that sets the sample size.
  pcmdec: do not needlessly set *data_size to 0
  alacdec: remove unneeded NULL or zero-size packet checks.
  alacdec: simplify buffer allocation by using FF_ALLOC_OR_GOTO()
  alacdec: ask for a sample for unsupported sample depths.
  alacdec: cosmetics: use 'ch' instead of 'chan' to iterate channels
  alacdec: move some declarations to the top of the function
  alacdec: always use get_sbits_long() for uncompressed samples
  ...

Conflicts:
	libavcodec/pcm.c
	tests/ref/acodec/pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 01:39:04 +02:00
David Conrad
1c5670dbb2 Timecode v2 muxer 
(cherry picked from commit 79ca161498744330ac940ae773dda3f1796ce955)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 01:03:22 +02:00
Justin Ruggles
82ed4f1ed8 remove the zork pcm seek test 
this was forgotten when the encoder was removed
 2011-10-26 18:48:02 -04:00
Michael Niedermayer
fc3203fcf9 doc: tiny spelling fix 
Found-by & newspelling-by: pasteeater
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-27 00:25:32 +02:00
David Conrad
748f921ad1 VP8: Unroll decoding segment update 2011-10-27 00:00:29 +02:00
David Conrad
ba3830e8a3 VP8: Remove no longer used vp8_rac_get_tree_with_offset 2011-10-26 23:56:34 +02:00
Michael Niedermayer
742d218bf1 avidec: Return correct error code from avi_sync() in case of IO error. 
Found-by: Tanami, Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 23:37:37 +02:00
Michael Niedermayer
7d7e3023d9 doc: document -moov_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 22:18:01 +02:00
Michael Niedermayer
3a56169fec movenc: reserved_moov_size, which allows placing moov at the begin of the file. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-26 22:18:01 +02:00
Justin Ruggles
4a6a29a7fb libopencore-amr: check output buffer size before decoding 2011-10-26 16:00:37 -04:00
Justin Ruggles
345d15d2f9 libopencore-amr: remove unneeded buf_size==0 check. 
avcodec_decode_audio3() already checks it before sending the packet to the
decoder.
 2011-10-26 16:00:37 -04:00
Justin Ruggles
402c98783d libopencore-amr: remove unneeded frame_count field. 
Use AVCodecContext.frame_number instead.
 2011-10-26 16:00:36 -04:00
Justin Ruggles
71ccfb3f14 aac_latm: remove unneeded check for zero-size packet. 
This is already checked by avcodec_decode_audio3()
 2011-10-26 12:21:18 -04:00
Justin Ruggles
f1901180e0 pcmdec: fix output buffer size check by calculating the actual output size 
prior to decoding.
 2011-10-26 12:01:07 -04:00
Justin Ruggles
154cd253e5 pcmdec: move codec-specific variable declarations to the corresponding codec 
blocks.
 2011-10-26 12:01:07 -04:00
Justin Ruggles
0093f96d34 pcmdec: return buf_size instead of src-buf. 
The values will always be the same, so this change eliminates an unneeded
variable. It also gets rid of the need to reset src when memcpy() is used.
 2011-10-26 12:01:07 -04:00
Justin Ruggles
85579b6381 avcodec: remove the Zork PCM encoder. 
The Zork PCM decoder does not decode the 1 sample we have correctly, therefore
the encoder based on the decoder is also incorrect. There is no good reason to
keep the encoder.
 2011-10-26 12:01:07 -04:00
Justin Ruggles
67a3b67c71 pcm_zork: use AV_SAMPLE_FMT_U8 instead of shifting all samples by 8. 2011-10-26 12:01:07 -04:00
Justin Ruggles
06af335a33 pcmenc: remove unneeded sample_fmt check. 
It is already checked by avcodec_open2().
 2011-10-26 12:01:07 -04:00
Justin Ruggles
d94e29cac9 pcmdec: move number of channels check to pcm_decode_init() 2011-10-26 12:01:06 -04:00
Justin Ruggles
83efd7652e pcmdec: remove unnecessary check for sample_fmt change 2011-10-26 12:01:06 -04:00
Justin Ruggles
381e195b46 pcmdec: move DVD PCM bits_per_coded_sample check near to the code that sets 
the sample size.
 2011-10-26 12:01:06 -04:00