generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,154 Commits 24 Branches 241 Tags 173 MiB
db5effe1a4
Commit Graph

32154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas George
8b52b46c97 ffmpeg: print the codecs names in the stream mapping. 2011-08-22 10:46:13 +02:00
Stefano Sabatini
e0ddc2e953 vsrc_movie: rename video movie specific callbacks, prefix them with "movie" 2011-08-22 10:40:50 +02:00
Stefano Sabatini
df4c7ae9db asink_abuffer: extend ABufferSinkContext to make it accept lists of formats in input 
This is required for the pending lavfi indev extension, also
consistent with the video buffer sink.
 2011-08-22 10:34:43 +02:00
Stefano Sabatini
3e4666f34c vsrc_movie: create media agnostic movie init and uninit routines 
Allow factorization for the pending work on the audio movie source.
 2011-08-22 10:34:43 +02:00
Stefano Sabatini
8aa62bb950 af_aformat: use evil ADD_FORMATS macro for cutting out duplicated code 2011-08-22 10:34:43 +02:00
Nicolas George
5fa98ab42d ffmpeg: ignore forward gaps for subtitles streams. 2011-08-22 09:55:35 +02:00
Carl Eugen Hoyos
05a267305d Support more codecs when muxing caf. 2011-08-22 09:35:58 +02:00
Anton Khirnov
ae60927aef libx264: only use ABR mode when the user explicitly set bitrate. 2011-08-22 07:17:39 +02:00
Anton Khirnov
03eff2bf43 libx264: use medium preset by default. 2011-08-22 07:17:38 +02:00
Anton Khirnov
0a593de38a mp2 encoder: make 128k the default bitrate. 2011-08-22 07:17:38 +02:00
Anton Khirnov
fb42d156ed movenc: use libx264 by default when possible for mov, mp4 and psp 2011-08-22 07:17:35 +02:00
Anton Khirnov
b71389cbae avienc: saner default audio codec. 
libmp3lame if available, ac3 otherwise.
 2011-08-22 07:17:19 +02:00
Anton Khirnov
3436c4a368 matroskaenc: saner default codecs. 
libvorbis/libx264 for video if available, otherwise ac3/mpeg4.
 2011-08-22 07:16:55 +02:00
Stefano Sabatini
b6d28eff84 avplay: add examples of how to specify size/pixel format through private options 
Clarify with an example what the user should use instead of the
deprecated (and no longer working) -s/-pix_fmt options.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-22 07:16:28 +02:00
Marton Balint
ba571f6b4d ffplay: remove unnecessary if (cur_stream) checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 20:33:02 +02:00
Marton Balint
84506ebd48 ffplay: get rid of the global cur_stream variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 20:33:02 +02:00
Marton Balint
5db1f94b8d ffplay: make step variable a member of the VideoState struct 
Getting rid of globals are generally a good thing. The patch also makes
toggle_pause and step_to_next_frame use a function parameter instead of
the global cur_stream variable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 20:33:02 +02:00
Matthew Einhorn
27667d28a6 Updates avcodec_get_pix_fmt_loss to return maximum loss for an invalid destination pixel format. 
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 20:33:02 +02:00
Reimar Döffinger
18de79692c roqvideodec: Improve checking of input buffer bounds. 
Fixes trac issue #408.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-21 16:34:35 +02:00
Stefano Sabatini
143d6a3fa7 lavc: add A|E|D flags to "ac" and "ar" options 
Fix setting of the corresponding AVCodecContext fields via
cmdutils.c:filter_codec_opts().
In particular, fix ffplay -ac and -ar options.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-21 16:06:16 +02:00
Michael Niedermayer
ff96098084 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  WavPack demuxer: do not rely on index when timestamp is not in indexed range.
  WavPack demuxer: store position of the first block in index.
  WavPack decoder: implement flush function
  avconv: Separate initialization from the main transcode loop.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 15:27:02 +02:00
Stefano Sabatini
34c997599e vsrc_testsrc: allow to set the sample aspect ratio 
Add the sar option. Useful for debugging/testing purposes.
 2011-08-21 15:27:09 +02:00
Stefano Sabatini
6a5c693a18 lavdev/lavfi: set sample aspect ratio in the output stream/codec context 2011-08-21 15:27:09 +02:00
Carl Eugen Hoyos
ef25e70de3 Stream-copying PureVoice into caf works fine. 2011-08-21 14:52:48 +02:00
Kostya Shishkov
ccb919e34b WavPack demuxer: do not rely on index when timestamp is not in indexed range. 
This fixes the situation when there are not enough entries in the index
(e.g. on initial seek there's only one index entry in the index) and index
search returns just the last known entry. That causes seeking function just to
seek there instead of trying harder to get at the requested position.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-21 12:55:17 +02:00
Kostya Shishkov
5561fe487f WavPack demuxer: store position of the first block in index. 
Currently for multichannel audio position for the last block position is
stored in index (and used for seeking), which is obviously not correct.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-21 12:54:35 +02:00
Kostya Shishkov
4ba8c521b1 WavPack decoder: implement flush function 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-21 12:54:34 +02:00
Stefano Sabatini
c5d9bd1938 asrc_abuffer: pass non-const string to strtok_r in init() 
Fix GCC warning:
asrc_abuffer.c: In function ‘init’:
asrc_abuffer.c:258: warning: passing argument 1 of ‘strtok_r’ discards qualifiers from pointer target type
 2011-08-21 11:38:30 +02:00
Mina Nagy Zaki
587c8ab912 lavfi: add asrc_abuffer - audio buffer source 
Originally based on code by Stefano Sabatini and S. N. Hemanth.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-21 11:37:57 +02:00
Michael Niedermayer
f138c7f993 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc/avconv: replace forgotten av by avconv.
  avconv: reset input_ts_offset between files.
  doc/avconv: extend -ss documentation.
  avconv: call flush_encoders() from transcode() directly.
  avconv: fix broken indentation.
  avconv: rescue poor abused limit_filesize global.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-20 15:43:56 +02:00
Stefano Sabatini
4b66c8b425 lavdev/lavfi: specify pos in the output packets 2011-08-20 15:00:36 +02:00
Stefano Sabatini
e30a0b1b3b lavfi: add ashowinfo filter 
Useful for debugging.
 2011-08-20 15:00:23 +02:00
Stefano Sabatini
9d84a17ba5 APIchanges: fix wrong major number for av_fifo_peek2() entry 2011-08-20 14:25:22 +02:00
Stefano Sabatini
7807cbc0c2 APIchanges: fill some lavfi entries with the corresponding git hash 2011-08-20 14:25:15 +02:00
Stefano Sabatini
7fd3e1c766 lavdev/lavfi: initialize variable, fix warning 2011-08-20 14:20:25 +02:00
Stefano Sabatini
9a15146768 ffprobe: use av_get_media_type_string() in media_type_string(), simplify 2011-08-20 14:20:25 +02:00
Stefano Sabatini
69e2c1a95a lavu: add av_get_media_type_string() convenience function 
Avoid code duplication.
 2011-08-20 14:20:25 +02:00
Reimar Döffinger
31ac0ac29b Fix parser not to clobber has_b_frames when extradata is set. 
Due to it in contrast to the decoder not setting up low_delay,
the code in parse_nal_units would always end up setting has_b_frames
to 1 (except when stream is explicitly marked as low delay).
Since the parser itself would create extradata, simply reopening
the parser would cause this.
estimate_timings_from_pts would cause the parser to be reopened
on the same stream.

This fixes trac issue #360.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-08-20 12:29:03 +02:00
Alex Converse
eaf2d37acc avconv: Separate initialization from the main transcode loop. 2011-08-19 15:41:05 -07:00
Michael Niedermayer
13e9a0fbfb h264: fixup indention 
issue spoted in last merge (probably indention fixed there by diego)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-20 00:38:26 +02:00
Anton Khirnov
f5bae2c6ed doc/avconv: replace forgotten av by avconv. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:37:44 -07:00
Anton Khirnov
f60a6b5853 avconv: reset input_ts_offset between files. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:37:14 -07:00
Anton Khirnov
cf4976ed7b doc/avconv: extend -ss documentation. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:36:43 -07:00
Anton Khirnov
b62b5cb6fd avconv: call flush_encoders() from transcode() directly. 
And remove now pointless parameter.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:36:05 -07:00
Anton Khirnov
c093150849 avconv: fix broken indentation. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:35:20 -07:00
Anton Khirnov
f21f294e05 avconv: rescue poor abused limit_filesize global. 
Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:34:24 -07:00
Carl Eugen Hoyos
7bdc5de33d Autodetect LOAS in transport streams. 
Fixes ticket 365.
 2011-08-20 00:27:54 +02:00
Carl Eugen Hoyos
47818b2a67 Add LOAS demuxer. 2011-08-20 00:27:38 +02:00
Michael Niedermayer
60b54e4b9f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Set error code before before jumping to fail.
  h264: fix PCM intra-coded blocks in monochrome case

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-19 23:32:51 +02:00
Alex Converse
e6d2b73784 avconv: Set error code before before jumping to fail. 2011-08-19 11:28:21 -07:00