virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
42,915 Commits 37 Branches 400 Tags 470 MiB
f5a5b4344b
Commit Graph

42915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f5a5b4344b ffmpeg: doxyfy some comments and mention the timebase used in various timestamp fields. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:58:26 +02:00
Michael Niedermayer
1a7af514de ffmpeg: move decoded_frame->pts computation together 
This clarifies the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:57:36 +02:00
Michael Niedermayer
c76a5365bb ffmpeg: Fix rounding errors in decoded_frame->pts computation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:56:52 +02:00
Michael Niedermayer
9b1fdb1c5a ffmpeg: fix assumed decoded_frame->pts timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:56:07 +02:00
Michael Niedermayer
b616405c16 ffmpeg: reset decoded_frame->pts after rescaling. 
This ensures its not used afterwards.
This commit should not change anything as it should not have been used afterwards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:51:56 +02:00
Michael Niedermayer
e15e5328a7 mpc8: Initialize AVFrame properly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:45:44 +02:00
Michael Niedermayer
5938b4d398 mpc7: Initialize AVFrame properly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:42:42 +02:00
Michael Niedermayer
55fa883b30 ffmpeg: fix units of next_?ts in debug printing routine. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:12:07 +02:00
Michael Niedermayer
506ffa793f h264_cabac: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 16:33:39 +02:00
Michael Niedermayer
7a4e30f3b6 h264_cabac: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 16:33:17 +02:00
William Yu
d5d5e3dabe lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts 2012-07-26 10:05:58 +02:00
Michael Niedermayer
97c0d5357d omadec: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:30:35 +02:00
Michael Niedermayer
9c83f3e659 loasdec: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:30:20 +02:00
Michael Niedermayer
e083a62e9d aacdec: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:29:59 +02:00
Michael Niedermayer
6f6182372c hls: replace probsize=0 by noheader flag removial. 
This fixes h264 timestamps in hls
Fixes ticket1572

Tested-by: crtmpserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:05:31 +02:00
Michael Niedermayer
12d1ee6a5e ff_add_index_entry: reject AV_NOPTS_VALUE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:05:31 +02:00
Michael Niedermayer
2cd491a47c lavf: move generic index generation code to a later point 
By moving it to a later point relative and unknown timestamps
are more likely to have been corrected

similar patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavformat/utils.c
 2012-07-26 03:04:49 +02:00
Michael Niedermayer
2880c31660 parse_packet: use pkt.pos always instead of the avparser offset. 
This is more correct and will be needed when the code is moved to
a later point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:20:59 +02:00
Michael Niedermayer
4e7f9ebdc2 wav: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:12:56 +02:00
Michael Niedermayer
fdc371114f ff_raw_audio_read_header: mark as AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:11:21 +02:00
Michael Niedermayer
5ea4ee7bcb flacdec: mark as AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:03:58 +02:00
Michael Niedermayer
ea8c12c90f mp3dec: mark as AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:03:56 +02:00
Piotr Bandurski
c5f23df2dd movenc: fix remuxing of yuv2 
Attached patch fixes remuxing of yuv2 in mov (and does not break remuxing of yuvs)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 01:37:46 +02:00
Michael Niedermayer
9054f6b66b probe_codec: fix memory corruption 
Found-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 01:10:55 +02:00
Nicolas George
6bf87785e8 ffmpeg: warn about new streams after startup. 2012-07-26 00:30:38 +02:00
Nicolas George
d0d9272580 faq: explain about new streams, probesize and analyzeduration. 2012-07-26 00:30:37 +02:00
Michael Niedermayer
f7d4e26c6a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: Add a new option 'rtmp_pageurl'
  doc: Update the description of the rtmp_tcurl option
  rtmp: Make the description of the rtmp_tcurl option more generic
  libfdk-aacenc: add LATM/LOAS encapsulation support
  sctp: add port missing error message
  tcp: add port missing error message
  avfilter: Fix printf format string conversion specifier

Conflicts:
	libavcodec/version.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 22:00:06 +02:00
Michael Niedermayer
9746f87f15 libvpxenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 21:35:48 +02:00
Michael Niedermayer
aee675a326 intrax8: asserts cleanup 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 21:35:30 +02:00
Samuel Pitoiset
758377a2b7 rtmp: Add a new option 'rtmp_pageurl' 
This option specifies the URL of the web page in which the media
was embedded.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:33:13 +03:00
Samuel Pitoiset
98df48db6d doc: Update the description of the rtmp_tcurl option 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:33:11 +03:00
Samuel Pitoiset
63ffa154e9 rtmp: Make the description of the rtmp_tcurl option more generic 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:33:10 +03:00
Kieran Kunhya
160a27c590 libfdk-aacenc: add LATM/LOAS encapsulation support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:32:33 +03:00
Jordi Ortiz
ecfff0e992 sctp: add port missing error message 
Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:31:16 +03:00
Jordi Ortiz
f9a9a14862 tcp: add port missing error message 
Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:30:39 +03:00
Michael Niedermayer
3005122485 hls: call avformat_find_stream_info() 
This is needed to correctly demux h264 in ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 17:40:33 +02:00
Michael Niedermayer
da62b4326b av_find_stream_info: skip flushing codecs and estimating timings if probe_size==0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 17:39:25 +02:00
Michael Niedermayer
703f294934 fate: update avui test due to 
commit 20e88d8618

    Fix avui stream-copy.

    The native decoder and MPlayer's binary decoder only need the
    APRG atom, QuickTime at least requires also the ARES atom and
    four additional 0 bytes padding at the end of stsd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 14:29:39 +02:00
Stefano Sabatini
10b44f4932 ffprobe: use av_guess_sample_aspect_ratio() for guessing the aspect ratio 
This is consistent with what av_dump_format() does.

In particular, fix trac ticket #1568.
 2012-07-25 10:05:02 +02:00
Stefano Sabatini
9b42d6ed1f lavf/avformat.h: fix verb person for av_guess_sample_aspect_ratio() 
Prefer impersonal form over third person, consistent with the rest of
docs.
 2012-07-25 10:04:57 +02:00
Stefano Sabatini
e564de26b3 lavfi/avfilter.h: add doxy for AVFilterLink.out_buf 2012-07-25 10:03:34 +02:00
Stefano Sabatini
b73be80d48 lavfi/avfilter.h: add doxy for AVFilterLink.cur_buf 2012-07-25 10:01:29 +02:00
Carl Eugen Hoyos
20e88d8618 Fix avui stream-copy. 
The native decoder and MPlayer's binary decoder only need the
APRG atom, QuickTime at least requires also the ARES atom and
four additional 0 bytes padding at the end of stsd.
 2012-07-25 09:26:17 +02:00
Diego Biurrun
49c45a2624 avfilter: Fix printf format string conversion specifier 
libavfilter/avfilter.c:224:9: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘int’ [-Wformat]
 2012-07-25 09:24:25 +02:00
Michael Niedermayer
1c2beff04a lavf: Set pos for all packets of AVSTREAM_PARSE_FULL_RAW files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 01:57:25 +02:00
Michael Niedermayer
72743aef03 imgconvert: Implement avcodec_find_best_pix_fmt_of_list() 
The old avcodec_find_best_pix_fmt() was insufficient due to 64 pix_fmt limit.
In ffmpeg this problem has been solved long ago through avcodec_find_best_pix_fmt2()
Today libav has added a incompatible modified version of avcodec_find_best_pix_fmt2()
under the same name, thus again breaking ABI/API ...

The avcodec_find_best_pix_fmt_of_list() added in this commit here makes the libav
API available to ffmpeg users too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 01:25:28 +02:00
Piotr Bandurski
23bb85b069 riff: make the G723.1 in wav output compatible with WMP/msacm codec 
Attached patch (together with demuxing patch) allows WMP/msacm G723.1 codec decode files encoded by FFmpeg.

Tested with both 6400 and 5333 mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 00:50:40 +02:00
Michael Niedermayer
e2fd18d40d lavf: factor AVStream st out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 00:45:17 +02:00
Michael Niedermayer
6b38101df5 parse_packet: reset pkt->pos after it has been used 
This should have no effect as it was not used in this case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 00:42:50 +02:00
Michael Bradshaw
043c75a989 libopenjpegenc: set numresolution max to INT_MAX 
OpenJPEG doesn't have a max lowres limit, so don't enforce an arbitrary one.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 00:29:34 +02:00