RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
38,097 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

38097 Commits

Author SHA1 Message Date
Michael Niedermayer 92b5f71a7d lavf: Reimplement new seek API emulation 
This fixes seeking to before and after files with ffplay.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-21 23:55:47 +01:00
Michael Niedermayer e6380afa6a avidec: Reduce log level for out of index error message. 
Its otherwise spaming every time one tries to seek to outside
the file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-21 23:55:47 +01:00
Michael Niedermayer 68fac5c2b8 doxy: Disable the main index page. 
Theres no usefull or even remotely complete information on it currently.
Which just leads to confusion.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-21 23:55:47 +01:00
Clément Bœsch 2bdac29360 doc/examples: rename filtering.c into filtering_video.c. 2012-02-21 22:34:39 +01:00
Clément Bœsch aecf0cf5ed doc/examples: add audio decoding/filtering example. 
Mostly based on doc/examples/filtering.c. lavfi API is still limited to
"buffer feeding" instead of "frame feeding" at the moment, so this
example code sticks with it.
 2012-02-21 16:45:37 +01:00
Clément Bœsch 241f8465d0 lavfi/abuffer: init the data planes with NULL pointers. 
Samples buffer ref is allocated and loaded with the uninitialized data
pointers:
     av_asrc_buffer_add_buffer()
  -> av_asrc_buffer_add_samples()
  -> avfilter_get_audio_buffer_ref_from_arrays(data, ...)

...which leads to a crash with at least lavfi/ashowinfo in case of !NULL
(see the for loop while samplesref->data[plane]).
 2012-02-21 16:45:34 +01:00
Michael Niedermayer eadd4264ee Merge remote-tracking branch 'qatar/master' 
* qatar/master: (36 commits)
  adpcmenc: Use correct frame_size for Yamaha ADPCM.
  avcodec: add ff_samples_to_time_base() convenience function to internal.h
  adx parser: set duration
  mlp parser: set duration instead of frame_size
  gsm parser: set duration
  mpegaudio parser: set duration instead of frame_size
  (e)ac3 parser: set duration instead of frame_size
  flac parser: set duration instead of frame_size
  avcodec: add duration field to AVCodecParserContext
  avutil: add av_rescale_q_rnd() to allow different rounding
  pnmdec: remove useless .pix_fmts
  libmp3lame: support float and s32 sample formats
  libmp3lame: renaming, rearrangement, alignment, and comments
  libmp3lame: use the LAME default bit rate
  libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
  libmp3lame: cosmetics: remove some pointless comments
  libmp3lame: convert some debugging code to av_dlog()
  libmp3lame: remove outdated comment.
  libmp3lame: do not set coded_frame->key_frame.
  libmp3lame: improve error handling in MP3lame_encode_init()
  ...

Conflicts:
	doc/APIchanges
	libavcodec/libmp3lame.c
	libavcodec/pcxenc.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/sgienc.c
	libavcodec/utils.c
	libavformat/hls.c
	libavutil/avutil.h
	libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-21 05:10:12 +01:00
Nicolas George a923b6b8f4 af_pan: move query_format before config_props. 
That is the logical order in which the functions are called,
and there is no longer any need of forward declarations.
 2012-02-20 23:36:03 +01:00
Nicolas George eb9ba527e7 af_pan: remove the indirect function call. 
libswresample is used in all cases.
 2012-02-20 23:36:03 +01:00
Justin Ruggles 770a5c6d02 adpcmenc: Use correct frame_size for Yamaha ADPCM. 
Output packet size should match avctx->block_align. The target output packet
size is 1024 bytes.
Before:
mono   - 1024 samples -> 512 bytes
stereo - 2048 samples -> 2048 bytes
After:
mono   - 2048 samples -> 1024 bytes
stereo - 1024 samples -> 1024 bytes
 2012-02-20 15:52:32 -05:00
Reimar Döffinger 6a3f1726af Add missing av_free_packet. 
Fixes memory leak when encoding at least with mpegvideo using the
new encode2 function.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-02-20 21:23:00 +01:00
Justin Ruggles 91a28b0e8e avcodec: add ff_samples_to_time_base() convenience function to internal.h 2012-02-20 15:20:17 -05:00
Justin Ruggles 41ac9bb253 adx parser: set duration 2012-02-20 15:08:41 -05:00
Justin Ruggles b3a4c7e0f1 mlp parser: set duration instead of frame_size 2012-02-20 15:08:41 -05:00
Justin Ruggles 2460b168b4 gsm parser: set duration 2012-02-20 15:08:41 -05:00
Justin Ruggles 7575ffac8a mpegaudio parser: set duration instead of frame_size 2012-02-20 15:08:40 -05:00
Justin Ruggles 16e54ac725 (e)ac3 parser: set duration instead of frame_size 2012-02-20 15:08:40 -05:00
Justin Ruggles c7f3f1c91e flac parser: set duration instead of frame_size 2012-02-20 15:08:40 -05:00
Justin Ruggles e9cda85351 avcodec: add duration field to AVCodecParserContext 
This will allow parsers to export the duration of the current frame being
output, if known, instead of using AVCodecContext.frame_size.
 2012-02-20 15:08:40 -05:00
Justin Ruggles 0b42a9388c avutil: add av_rescale_q_rnd() to allow different rounding 2012-02-20 15:08:40 -05:00
Nicolas George a297856b8c af_pan: reindent after last commit. 2012-02-20 20:46:35 +01:00
Nicolas George a44b510d56 af_pan: use libswr for rematrixing. 2012-02-20 20:46:35 +01:00
Nicolas George 560b224f53 libswr: allow to set custom matrices. 2012-02-20 20:46:35 +01:00
Reimar Döffinger 016c7bb762 matroskadec: remove H.264 special-case that disabled header parsing. 
The parser was fixed so this workaround should no longer
be necessary.
This allows using stream-copy to fix files with keyframes
incorrectly marked.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-02-20 20:42:55 +01:00
Paul B Mahol 0996f406c4 pnmdec: remove useless .pix_fmts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-02-20 13:46:57 -05:00
Justin Ruggles e00959a9b1 libmp3lame: support float and s32 sample formats 2012-02-20 12:32:31 -05:00
Justin Ruggles e232225276 libmp3lame: renaming, rearrangement, alignment, and comments 2012-02-20 12:32:30 -05:00
Justin Ruggles 232e16dd02 libmp3lame: use the LAME default bit rate 
Also, only set bit rate for CBR.
 2012-02-20 12:32:30 -05:00
Justin Ruggles 1f516c0451 libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing 2012-02-20 12:32:30 -05:00
Justin Ruggles e3d2c89e9d libmp3lame: cosmetics: remove some pointless comments 2012-02-20 12:32:30 -05:00
Justin Ruggles bf909fc456 libmp3lame: convert some debugging code to av_dlog() 
also remove unneeded commented-out full frame data debugging
 2012-02-20 12:32:30 -05:00
Justin Ruggles 469d2a8e8e libmp3lame: remove outdated comment. 
We now require at least libmp3lame 3.98.3.
lame_encode_buffer_interleaved() still doesn't work for mono, but it does not
"die"; it just expects a stereo interleaved buffer.
 2012-02-20 12:32:30 -05:00
Justin Ruggles 35cfd7d09c libmp3lame: do not set coded_frame->key_frame. 
it is already set in avcodec_alloc_frame()
 2012-02-20 12:32:30 -05:00
Justin Ruggles 8dad25ebf7 libmp3lame: improve error handling in MP3lame_encode_init() 2012-02-20 12:32:30 -05:00
Justin Ruggles 310c372e12 libmp3lame: remove unneeded 'stereo' field from Mp3AudioContext 2012-02-20 12:32:30 -05:00
Matthieu Bouron 278d6ab900 ffprobe: report bit rate in stream description 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-02-20 17:46:26 +01:00
Stefano Sabatini 3293b1adca lavc: set bit_rate in the decoder context, just after the init stage 
Also move the get_bit_rate() function, in order to avoid an undefined
symbol reference in avcodec_open2().
 2012-02-20 17:46:18 +01:00
Martin Storsjö a4f97be1a9 hls: Reset the AVIOContext when seeking 
This avoids reading any old data in the AVIOContext buffer after
the seek, and indicates to the mpegts demuxer that we've seeked,
avoiding continuity check errors.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-20 11:10:02 +02:00
Clément Bœsch 6e6bdeb137 doc: fix channel layout value in abuffer example. 
The channel layout must start with 0x, otherwise it is parsed as a
number of channels.
 2012-02-20 09:23:44 +01:00
Anton Khirnov 55fd7da107 pcxenc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov fb11e22fda sgienc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov 61eaf45c99 targaenc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov 1e742ea3c8 targaenc: don't modify input frame. 
Set the pict_type/key_frame properties on the coded picture.
 2012-02-20 07:50:44 +01:00
Anton Khirnov 3227770092 roqvideoenc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov 4fd7cfef0b roqvideoenc: add const qualifier to the input frame. 2012-02-20 07:50:44 +01:00
Anton Khirnov 1ea5755046 pnmenc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov bc9c70e5a3 huffyuv: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov 2abee9be82 v410enc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov 11505f39e1 zmbvenc: switch to encode2(). 2012-02-20 07:50:44 +01:00
Anton Khirnov 8c8c7b5e37 zmbvenc: move header writing to the end of encode_frame(). 
This makes switching to encode2() simpler, because it allows us to know
exactly how large should the output buffer be before we start writing
into it.
 2012-02-20 07:50:44 +01:00