generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70,304 Commits 24 Branches 241 Tags 173 MiB
732c3ebffa
Commit Graph

2133 Commits

Author SHA1 Message Date
Michael Niedermayer
59eb12faff Merge remote branch 'qatar/master' 
* qatar/master: (30 commits)
  AVOptions: make default_val a union, as proposed in AVOption2.
  arm/h264pred: add missing argument type.
  h264dsp_mmx: place bracket outside #if/#endif block.
  lavf/utils: fix ff_interleave_compare_dts corner case.
  fate: add 10-bit H264 tests.
  h264: do not print "too many references" warning for intra-only.
  Enable decoding of high bit depth h264.
  Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
  Add support for higher QP values in h264.
  Add the notion of pixel size in h264 related functions.
  Make the h264 loop filter bit depth aware.
  Template dsputil_template.c with respect to pixel size, etc.
  Template h264idct_template.c with respect to pixel size, etc.
  Preparatory patch for high bit depth h264 decoding support.
  Move some functions in dsputil.c into a new file dsputil_template.c.
  Move the functions in h264idct into a new file h264idct_template.c.
  Move the functions in h264pred.c into a new file h264pred_template.c.
  Preparatory patch for high bit depth h264 decoding support.
  Add pixel formats for 9- and 10-bit yuv420p.
  Choose h264 chroma dc dequant function dynamically.
  ...

Conflicts:
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/arm/dsputil_init_neon.c
	libavcodec/arm/dsputil_iwmmxt.c
	libavcodec/arm/h264pred_init_arm.c
	libavcodec/bfin/dsputil_bfin.c
	libavcodec/dsputil.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_ps.c
	libavcodec/h264_refs.c
	libavcodec/h264dsp.c
	libavcodec/h264idct.c
	libavcodec/h264pred.c
	libavcodec/mlib/dsputil_mlib.c
	libavcodec/options.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/h264_altivec.c
	libavcodec/ps2/dsputil_mmi.c
	libavcodec/sh4/dsputil_align.c
	libavcodec/sh4/dsputil_sh4.c
	libavcodec/sparc/dsputil_vis.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/dsputil_mmx.c
	libavformat/options.c
	libavformat/utils.c
	libavutil/pixfmt.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/swscale_template.c
	tests/ref/seek/lavf_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-11 05:47:02 +02:00
Robert Leatherwood
b5e089924f "Initialize" copy_tb like the other global variables. 2011-05-11 00:57:42 +02:00
Michael Niedermayer
eeaba924b7 ffmpeg: Fix -t with files that do not have any timestamps. 
This for example fixes -t with some frext h264 reference streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-10 17:31:32 +02:00
Alexander Strange
cb48fdf67e ffmpeg: Simplify decode loop condition to not use next_pts 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-10 07:23:51 -04:00
Stefano Sabatini
bc97695af8 ffmpeg: remove unused fields AVOutputStream.original_width/height 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-10 07:17:52 +02:00
Stefano Sabatini
f38d900fb8 ffmpeg: remove unused variable padding_src in do_video_out() 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-10 07:17:39 +02:00
Michael Niedermayer
d1991f51f3 ffmpeg: fix negative verbosity. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-10 07:17:21 +02:00
Stefano Sabatini
0420bf09f7 ffmpeg: rename configure_filters() to configure_video_filters() 
Mostly useful for the audio-filters branch, to make more apparent the
distinction between configure_audio_filters() and
configure_video_filters().

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-10 07:15:06 +02:00
Stefano Sabatini
5d2c6f42d7 cmdutils: remove list_fmts(), simplify 
The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().

Also fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type
cmdutils.h:163: note: expected ‘void (*)(char *, int,  int)’ but argument is of type ‘char * (*)(char *, int,  enum AVSampleFormat)’

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-10 07:14:13 +02:00
Takashi Mochizuki
c3e40410d4 Add missing CONFIG_AVFILTER check. 
Fix configure --disable-avfilter issue.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-10 07:12:27 +02:00
Michael Niedermayer
b97b4b58a6 Merge remote branch 'qatar/master' 
* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-10 04:03:17 +02:00
Anton Khirnov
19615089a0 ffmpeg.c: reset avoptions after each input/output file. 
This is consistent with how all the other options work.
 2011-05-09 19:35:20 +02:00
Anton Khirnov
1435f2fa72 ffmpeg.c: store per-output stream sws flags. 2011-05-09 19:35:20 +02:00
Michael Niedermayer
6841c8c579 Merge remote branch 'qatar/master' 
* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-09 04:50:56 +02:00
Anton Khirnov
648e55ff1b ffmpeg.c: check for interlaced flag in the correct place. 
In the corresponding codec context, not global options storage.
 2011-05-08 10:43:24 +02:00
Stefano Sabatini
64c06615d2 vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface 
Now that pix_fmt, width, and height are directly embedded in the AVFrame,
there is no need to pass these values as separate arguments.
 2011-05-07 12:03:59 +02:00
Stefano Sabatini
2beac7c325 ffmpeg: rename ost->pict_tmp to ost->resample_frame 
The new name is more consistent with the employed naming scheme, and
more meaningful.
 2011-05-07 12:03:59 +02:00
Stefano Sabatini
04c373c1e9 ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out() 
Compact code, improve readability.
 2011-05-07 12:03:58 +02:00
Stefano Sabatini
a851fa7fec ffmpeg: move resample_changed check within the #if !CONFIG_AVFILTER 
The check and the corresponding message in do_video_out() are
unnecessary in the libavfilter path, as a similar check and message
are performed within the buffer source.
 2011-05-07 12:03:58 +02:00
Stefano Sabatini
70c24b2171 ffmpeg: remove useless intermediary variable resample_dst in do_video_out() 2011-05-07 12:03:58 +02:00
Stefano Sabatini
f5a669c229 ffmpeg: simplify mid-stream reconfiguration when libavfilter is disabled 
Implement lazy initialization of the image resample context, so that
the initialization code does not need to be duplicated.

Also manage the case in which resample/size change mid-stream. For
each packet the code computes if resampling is needed.

Previously the resample check was done only at the initialization, in
case size/format changed and no resample was detected at the init
stage ffmpeg was silently exiting.
 2011-05-07 12:03:58 +02:00
Stefano Sabatini
566666caf3 lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props() 
avfilter_copy_frame_props() avoids code duplication and increases
robustness.

The added files libavfilter/avcodec.[ch] are used for containing
utilities useful for gluing togheter libavfilter and libavcodec.
 2011-05-07 12:03:49 +02:00
Michael Niedermayer
b000b86e1d Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  doc: Check standalone compilation before submitting new components.
  Fix standalone compilation of pipe protocol.
  Fix standalone compilation of ac3_fixed encoder.
  Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
  Fix standalone compilation of IMC decoder.
  Fix standalone compilation of WTV demuxer.
  Fix standalone compilation of MXPEG decoder.
  flashsv: K&R cosmetics
  matroskaenc: fix memory leak
  vc1: make overlap filter for I-frames bit-exact.
  vc1dec: use s->start/end_mb_y instead of passing them as function args.
  Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
  Replace strncpy() with av_strlcpy().
  indeo3: Eliminate use of long.
  get_bits: make cache unsigned to eliminate undefined signed overflow.
  asfdec: fix assert failure on invalid files
  avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
  nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
  ...

Conflicts:
	doc/developer.texi
	libavcodec/Makefile
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c
	libavformat/Makefile
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-05 03:30:24 +02:00
Alex Converse
1a5e4fd8c5 Replace strncpy() with av_strlcpy(). 2011-05-03 21:20:13 -07:00
Michael Niedermayer
707e8612e8 Merge remote branch 'qatar/master' 
* qatar/master:
  Implement fate-rsync target
  Make ffmpeg support generic data stream

Conflicts:
	cmdutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-04 04:06:26 +02:00
Luca Barbato
e3b540b424 Make ffmpeg support generic data stream 
The patch is the first step to support -dcodec copy
 2011-05-03 11:51:55 +02:00
Michael Niedermayer
2525821f1a Merge remote branch 'qatar/master' 
* qatar/master:
  vp8: frame-multithreading.
Duplicate  Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Duplicate  Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Bug spoted&removed in last merge:  dpx: Do not use DPX encoder for decoding.

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-03 04:08:23 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
301183d9be replace deprecated av_get_pict_type_char() with av_get_picture_type_char() 2011-05-02 16:41:35 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Stefano Sabatini
6209669de4 Replace deprecated av_get_pict_type_char() with av_get_picture_type_char(). 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 11:24:45 +02:00
Stefano Sabatini
35fe66abbc lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio 
Improve consistency with libavcodec.

This breaks libavfilter API/ABI.

The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously
done with the lavfi minor number.
 2011-05-01 13:10:18 +02:00
Stefano Sabatini
77e9dee8ae lavc: add a sample_aspect_ratio field to AVFrame 
The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.
 2011-05-01 13:10:06 +02:00
Michael Niedermayer
fa1195227f FFMPEG: support demuxer specific options. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 22:09:15 +02:00
Michael Niedermayer
7d727f1338 LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 22:09:15 +02:00
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master' 
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 01:58:26 +02:00
Diego Biurrun
2e15305b70 Remove some disabled printf debug cruft. 2011-04-29 20:00:53 +02:00
Michael Niedermayer
0886267e3c Revert buggy hunk that leaked in from a libav merge. 
This unbreaks compilation with --disable-avfilter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 14:09:26 +02:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Michael Niedermayer
a38cdfde52 vsrc_buffer: Set output size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-26 18:16:48 +02:00
Michael Niedermayer
7a11c82fb7 vsrc_buffer: add sample_aspect_ratio fields to arguments. 
This fixes aspect handling in ffmpeg.

This is based on a patch by Baptiste.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 07:38:24 +02:00
Michael Niedermayer
7b376b398a Merge remote branch 'qatar/master' 
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 03:41:22 +02:00
Diego Biurrun
89b503b55f Lowercase all ff* program names. 2011-04-23 19:12:24 +02:00
Carl Eugen Hoyos
3c483620c9 Cosmetics: Rename variable daemon as run_as_daemon. 
daemon() is defined in unistd.h for BSD and Cygwin.
 2011-04-22 18:49:44 +02:00
Michael Niedermayer
8772156be0 Merge remote branch 'qatar/master' 
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-22 03:54:30 +02:00
Stefano Sabatini
7046b63e69 ffmpeg: call pre_process_video_frame() only if decoding is needed 
In output_packet(), move the pre_process_video_frame() call inside the
if (ist->decoding_needed) { } block. This way
pre_process_video_frame() is not called when stream-copy has been
selected.

Also simplify.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-21 12:08:42 +02:00
Stefano Sabatini
79157f400b error: remove AVERROR_NUMEXPECTED 
AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and
has a too much specific meaning, which is better explained through a
log message. Thus it can be replaced by AVERROR(EINVAL).

This breaks API.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-21 07:10:16 +02:00
Baptiste Coudurier
2c18893a91 In libx264 wrapper, correctly support 2pass log filename option. 2011-04-20 15:46:40 -07:00
Michael Niedermayer
efb5fa79f5 Merge remote branch 'qatar/master' 
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-20 04:48:23 +02:00
Stefano Sabatini
55815edca0 prefer avio_check() over url_exist() 
The problem with url_exist() is that it tries to open a resource in
RDONLY mode. If the file is a FIFO and there is already a reading
client, the open() call will hang.

By using avio_check() with access mode of 0, the second reading
process will check if the file exists without attempting to open it,
thus avoiding the lock.

Fix issue #1663.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-19 19:48:07 +02:00
Stefano Sabatini
59d96941f0 avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols 
Make AVIO_FLAG_ access constants work as flags, and in particular fix
the behavior of functions (such as avio_check()) which expect them to
be flags rather than modes.

This breaks API.
 2011-04-19 19:47:58 +02:00
Anton Khirnov
41d0eb1c81 lavc: remove the FF_API_SET_STRING_OLD cruft. 2011-04-19 18:41:00 +02:00
Anton Khirnov
761ad42968 lavf: remove FF_API_MAX_STREAMS cruft 2011-04-19 18:28:38 +02:00
Stefano Sabatini
c438c90756 ffmpeg: reformat resample condition code in transcode() 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 12:23:59 +02:00
Stefano Sabatini
0f230c53df ffmpeg: factorize resampling condition check in do_video_out() 
Simplify and improve readability.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 12:23:59 +02:00
Stefano Sabatini
6a46aab49b ffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippet 
Simplify, ease readability.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 12:23:59 +02:00
Stefano Sabatini
dfc6f5ae90 ffmpeg: improve reporting if size/pixel format changes 
Use av_log() rather than fprintf(stderr, ...), and show information
related to the previous size/pixel format configuration.

Consistent with the corresponding message issued in case of audio
configuration change.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 12:23:58 +02:00
Stefano Sabatini
58bc9ac5cb ffmpeg: remove unused fields AVOutputStream.original_width/height 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 12:23:58 +02:00
Stefano Sabatini
b0b83973d1 ffmpeg: remove unused variable padding_src in do_video_out() 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-19 12:23:47 +02:00
Michael Niedermayer
39aafa5ee9 ffmpeg:Daemon mode, add -d as first option to try it. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-19 01:54:58 +02:00
Michael Niedermayer
17ee7b5515 ffmpeg:Fix negative verbositiy 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-19 01:54:58 +02:00
Baptiste Coudurier
abf8342aa9 ffmpeg: fix -aspect cli option 
Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.

If the output display aspect ratio is specified with -aspect, it is
set at the end of the filterchain, thus overriding the value set by
filters in the filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors).
 2011-04-16 16:47:26 -07:00
Stefano Sabatini
bdf3d3bf9d ffmpeg: use parse_number_and_die() when it makes sense 
Prefer parse_number_or_die() over atoi()/atol() parsing for the options:
-pass, -top, -vc, and -qscale.

Improve input validation.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-16 21:47:06 +02:00
Stefano Sabatini
5381823eb6 ffmpeg: rename configure_filters() to configure_video_filters() 
Mostly useful for the audio-filters branch, to make more apparent the
distinction between configure_audio_filters() and
configure_video_filters().

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-11 00:14:55 +02:00
Lou Logan
f8de11cf7d Redefine sameq 
I think the documentation of sameq is causing confusion and misuse of
this option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-10 09:27:50 +02:00
Michael Niedermayer
d4d09329ee Merge remote branch 'qatar/master' 
* qatar/master:
  lavf: bump minor and add an APIChanges entry for avformat cleanup
  lavf: get rid of ffm-specific stuff in avformat.h
Not pulled:  avio: deprecate av_protocol_next().
  avio: add a function for iterating though protocol names.
  lavf: rename a parameter of av_sdp_create from buff->buf
  lavf: rename avf_sdp_create to av_sdp_create.
  lavf: make av_guess_image2_codec internal
  avio: make URLProtocol internal.
  avio: make URLContext internal.
  lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
  lavf: use designated initializers for all protocols
  applehttp: don't use deprecated url_ functions.
  avio: move two ff_udp_* functions from avio_internal to url.h
  asfdec: remove a forgotten declaration of nonexistent function
  avio: deprecate the typedef for URLInterruptCB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-09 03:17:07 +02:00
Anton Khirnov
3ee53dabcf lavf: get rid of ffm-specific stuff in avformat.h 2011-04-08 20:58:19 +02:00
Anton Khirnov
c3675dfe1e lavf: rename avf_sdp_create to av_sdp_create. 
The new name is more consistent with the rest of the API.
 2011-04-08 16:45:40 +02:00
Michael Niedermayer
c88caa522c Merge remote branch 'qatar/master' 
* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 02:50:13 +02:00
Anton Khirnov
80c6e238b0 avio: avio_ prefix for url_set_interrupt_cb. 2011-04-07 18:11:24 +02:00
Anton Khirnov
f87b1b373a avio: AVIO_ prefixes for URL_ open flags. 2011-04-07 18:07:16 +02:00
Michael Niedermayer
6b1c886b65 Fix ticket20 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 23:21:44 +02:00
Michael Niedermayer
d6c858658f Revert "ffmpeg: fix aspect ratio setting" 
This reverts commit d1eb50bb29.
Reason, it breaks fate
 2011-04-06 03:01:25 +02:00
Michael Niedermayer
11d78415ca Merge remote branch 'qatar/master' 
* qatar/master:
  psymodel: extend API to include PE and bit allocation.
  avio: always compile dyn_buf functions
  Remove unnecessary parameter from ff_thread_init() and fix behavior
  Revert "aac_latm_dec: use aac context and aac m4ac"
  configure: tell user if libva is enabled like the rest of external libs.
  Add silence support for AV_SAMPLE_FMT_U8.
  avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
  avio: deprecate av_url_read_seek
  avio: deprecate av_url_read_pause
  ac3enc: NEON optimised extract_exponents

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 02:59:49 +02:00
Michael Niedermayer
b5ef6f8eb4 Fix crash in ffmpeg.c with PIX_FMT_NONE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Stefano Sabatini
d1eb50bb29 ffmpeg: fix aspect ratio setting 
This is done by adding a setsar filter at the beginning of the
configured filterchain.

This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors),
but directly modifies the filterchain structure.

This also changes the ffmpeg -aspect behavior, as following filters in
the filterchain can change the DAR/SAR set by the inserted setsar
filter.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-05 15:33:38 +02:00
Alex Converse
14cf0fd2f5 Add silence support for AV_SAMPLE_FMT_U8. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-05 09:08:04 +02:00
Lou Logan
8af3167bb6 Redefine sameq 
I think the documentation of sameq is causing confusion and misuse of
this option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-05 03:21:36 +02:00
Peter Ross
100a6b7c77 ffmpeg: make 'bits_per_raw_sample' option more useful 
Currently bits_per_raw_sample is exposed as an AVCodecContext option.
The option is not very useful, because ffmpeg 1) overwrites it with
a value from the upstream codec, or 2) it resets the value whenever
the video is resampled.

This patch adds the -bits_per_raw sample option to FFmpeg, and
caches the value like is done for the -pix_fmt option.

Example usage:
ffmpeg v210.avi -pix_fmt rgb48 -bits_per_raw_sample 10 out%d.dpx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-04 00:35:58 +02:00
Michael Niedermayer
7d948dc424 Support changing pixel formats on avfilter input. 
Fix issue2217
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-03 16:40:12 +02:00
Michael Niedermayer
b25d931a82 Fix stream mapping regression 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-02 16:15:16 +02:00
Michael Niedermayer
e7c7b0d000 Another aspect ratio fix try. This leaves the setdar addition at the end (preferred by people). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 17:38:29 +02:00
Peter Ross
6408529b5d Increase ffmpeg video encoding buffer size to permit encoding of DPX images 
The header generated by the DPX encoder is 1664 bytes.
 2011-04-01 23:11:54 +11:00
Michael Niedermayer
859676dd42 Insert setdar at the begin of a filter chain instead the end. 
This fixes -vf setsar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 02:14:46 +02:00
Michael Niedermayer
8b8bf89e52 Revert "Do no modify terminal parameters using termios.h" 
This reverts commit cb48e245e6.

Reason being we like pressing "q" to quit ffmpeg.

Conflicts:

	ffmpeg.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-31 00:22:29 +02:00
Stefano Sabatini
2ee85c0671 ffmpeg: warns the user when the selected pixel format is ignored 2011-03-27 15:53:45 +02:00
Stefano Sabatini
0c55c6d30e cmdutils: remove list_fmts(), simplify 
The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().

Als fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type
cmdutils.h:163: note: expected ‘void (*)(char *, int,  int)’ but argument is of type ‘char * (*)(char *, int,  enum AVSampleFormat)’
 2011-03-26 14:40:30 +01:00
Michael Niedermayer
27ef7b1bcd Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
  Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
  Use audio_service_type to set stream disposition.
  Add APIchanges entry for audio_service_type.
  Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
  configure: in check_ld, place new -l flags before existing ones
  support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
  doc: update build system documentation
  aacenc: indentation
  aacenc: fix the side calculation in search_for_ms
  vp8.c: rename EDGE_* to VP8_EDGE_*.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-26 03:06:30 +01:00
Justin Ruggles
34b47d7cbc Add audio_service_type field to AVCodecContext for encoding and reporting 
of the service type in the audio bitstream.
 2011-03-25 16:51:53 -04:00
Stefano Sabatini
4ffc79e7a0 ffmpeg: include conditionally the sws_flags variable 
The variable is not used when libavfilter is enabled.
Fix the warning:
ffmpeg.c: At top level:
ffmpeg.c:242: warning: ‘sws_flags’ defined but not used
 2011-03-25 18:42:51 +01:00
Michael Niedermayer
6dfb4ab8c8 Make multiple Ctrl-C capable to kill stuck protocols. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-25 02:26:49 +01:00
Michael Niedermayer
4fa0e24736 Merge remote-tracking branch 'newdev/master' 
* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/ac3dec.c
	libavformat/avio.h
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-23 02:42:56 +01:00
Dave Yeo
b58b9fa3b5 Make sure kbhit() is in conio.h 
Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-22 11:07:46 +00:00
Michael Niedermayer
d4a50a2100 Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-21 03:33:28 +01:00
Panagiotis H.M. Issaris
cb48e245e6 Do no modify terminal parameters using termios.h 
Remove usage of tcgetattr and tcsetattr to modify terminal
parameters, and rely on ctrl-c to stop instead of pressing 'q'.
On systems with conio.h, keep the old behavior.

Changing the terminal settings causes problems if multiple instances
are running asynchronously on the same terminal, such as during a
parallel FATE run, or if the process crashes before restoring the
terminal.  In both cases, the terminal state is messed up requiring
a manual reset.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 21:13:26 +00:00
Stefano Sabatini
17a4ec8e7e ffmpeg: modify help text for the map option 
Change "file:stream[:syncfile:syncstream]" to
"file.stream[:syncfile.syncstream]", the latter syntax is more
consistent with the stream identifier form printed by
av_dump_format(), and more readable. Both syntaxes are currently
accepted by the opt_map() code.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-20 21:07:03 +01:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Thierry Foucu
a7844c580d Fix compilation error when CONFIG_AVFILTER is not defined. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Michael Niedermayer
27efa296c2 Merge branch 'master' of git://git.ffmpeg.org/ffmpeg 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-12 17:55:59 +01:00
Stefano Sabatini
5dbe78bf91 ffmpeg: remove unused variable in ffmpeg_exit() 
Fix the warning:
ffmpeg.c: In function ‘ffmpeg_exit’:
ffmpeg.c:509: warning: unused variable ‘j’

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-12 14:08:27 +00:00
Carl Eugen Hoyos
0de8ebf491 Do not use AVFMT_FLAG_NONBLOCK for the output file. 
Allows to use output device alsa.
 2011-03-08 20:45:26 +01:00
Anton Khirnov
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +01:00
Michael Niedermayer
8993b5969a Make sure the first q press doesnt f*ck up the protocols and thus written files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-07 17:25:38 +01:00
Michael Niedermayer
9055240761 Fix seting of decode_interrupt_cb() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-07 17:23:32 +01:00
Anton Khirnov
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Martin Storsjö
d34ffd3ce9 ffmpeg: Use av_pkt_dump_log2 
This makes dumped packet timestamps proper for streams with
timebases other than AV_TIME_BASE.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 5e33e7bdac)
 2011-03-03 14:15:11 +01:00
Martin Storsjö
5e33e7bdac ffmpeg: Use av_pkt_dump_log2 
This makes dumped packet timestamps proper for streams with
timebases other than AV_TIME_BASE.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-02 11:29:38 +01:00
Anton Khirnov
ebb92e0768 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
 2011-02-23 18:22:03 +01:00
Anton Khirnov
22a3212e32 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:18:55 -05:00
Michael Niedermayer
5c20c81bfa Fix issue2619. 
regression introduced in 1762d9ced7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-19 17:31:10 +01:00
Anton Khirnov
0ebf475494 lavf: add av_ prefix to dump_format() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 610219a598)
 2011-02-18 19:52:28 +01:00
Anton Khirnov
610219a598 lavf: add av_ prefix to dump_format() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-16 23:39:56 +00:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Michael Niedermayer
1762d9ced7 Restructure video filter implemenattion in ffmpeg.c. 
This fixes several bugs like multiple outputs and -aspect mixed with -vf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-14 23:03:13 +01:00
Alexander Strange
043d2ff267 Deprecate avcodec_thread_init() 
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03)
 2011-02-11 02:54:08 +01:00
Alexander Strange
c0b102ca03 Deprecate avcodec_thread_init() 
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-09 09:17:28 -05:00
Nicolas George
76ad67cae7 Implement guessed_pts in avcodec_decode_video2 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-07 19:32:07 +01:00
James Zern
ba3517aa6f cmdutils: fix opt_values leak 
Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3a6a9cdf5b)
 2011-02-06 20:31:45 +01:00
Alexander Strange
fd0ae17aaf Adopt pkt_dts/pkt_pts in lavc clients 
No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b47495397)
 2011-02-06 20:31:45 +01:00
Martin Storsjö
42f97696ae Use avformat_free_context for cleaning up muxers 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b22dbb291d)
 2011-02-06 20:31:45 +01:00
Stefano Sabatini
ab543afe47 Make avfilter_graph_free() free the graph. 
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4359288c56)
 2011-02-06 20:31:42 +01:00
James Zern
3a6a9cdf5b cmdutils: fix opt_values leak 
Add free to uninit_opts and relocate opt_names to same

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 17:18:45 -05:00
Alexander Strange
6b47495397 Adopt pkt_dts/pkt_pts in lavc clients 
No behavior change; this makes DTS reliable with the next patch.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-05 16:37:43 -05:00
Martin Storsjö
b22dbb291d Use avformat_free_context for cleaning up muxers 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-04 11:39:55 -05:00
Stefano Sabatini
4359288c56 Make avfilter_graph_free() free the graph. 
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-04 02:55:11 +00:00
Anton Khirnov
4a908866a1 ffmpeg.c: rename map_meta_data option to map_metadata 
It's consistent with the -metadata option and easier to write.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 87e4d9b252)
 2011-02-04 03:10:09 +01:00
Anton Khirnov
87e4d9b252 ffmpeg.c: rename map_meta_data option to map_metadata 
It's consistent with the -metadata option and easier to write.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-02 22:44:37 +01:00
Michael Niedermayer
7b3ea5507c Add sample_aspect_ratio fields to vsrc_buffer arguments. 
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste
 2011-01-31 21:32:06 +01:00
Stefano Sabatini
5a8d1075ec Make ffmpeg warns the user when the selected sample format is ignored. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fa34a3626c)
 2011-01-31 18:25:46 +01:00
Stefano Sabatini
fa34a3626c Make ffmpeg warns the user when the selected sample format is ignored. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-31 12:55:38 +00:00
Diego Elio Pettenò
41727b8522 Make local variables static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a6d1bd05c9)
 2011-01-26 03:43:29 +01:00
Stefano Sabatini
0f16f72552 Do not set audio_resample to 0 if audio_sync_method is > 1. 
If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.

Fix issue 2516, which was introduced by SVN r25939.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 07b48f8c7a)
 2011-01-26 03:43:28 +01:00
Diego Elio Pettenò
a6d1bd05c9 Make local variables static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-25 00:02:41 +00:00
Stefano Sabatini
07b48f8c7a Do not set audio_resample to 0 if audio_sync_method is > 1. 
If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.

Fix issue 2516, which was introduced by SVN r25939.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-24 17:30:33 +00:00
Mike Scheutzow
ba0dd9e8ff streamid does not work with newaudio, newvideo, newsubtitle 
fixes issue2465.

The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.

The cause was a conflict between the feature where streamid values were
reset to default for each output filename, and the implementation of
-new*, which requires that the -new* option be specified after the
target filename.

My patch changes the ffmpeg behavior so that user-specified streamid
values apply to all the following output files on the command line
(rather than just the next output filename.)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 20ac9de3df)
 2011-01-23 19:32:07 +01:00
Mike Scheutzow
20ac9de3df streamid does not work with newaudio, newvideo, newsubtitle 
fixes issue2465.

The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.

The cause was a conflict between the feature where streamid values were
reset to default for each output filename, and the implementation of
-new*, which requires that the -new* option be specified after the
target filename.

My patch changes the ffmpeg behavior so that user-specified streamid
values apply to all the following output files on the command line
(rather than just the next output filename.)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-22 04:10:22 +01:00
Michael Niedermayer
59e2118e97 Update threshold to detect real timebase for stream copy. 
This may fix a bug where quicktime files use 1/600 timebase.
 2011-01-18 16:04:33 +01:00
Michael Niedermayer
d9c3e5f6d8 Feed the filter chain with the sample aspect ratio from the muxer or codec layer 
like it has been done prior libavfilter.
 2011-01-17 23:22:42 +01:00
Baptiste Coudurier
0f27e6b4c2 New "copytb" ffmpeg cli option to copy input stream time base when stream copying. 
This should avoid non monotone timestamps for video streams with vfr.

Originally committed as revision 26340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 22:01:49 +00:00
Stefano Sabatini
6c18f1cda2 Make opt_audio_sample_fmt() abort in case of invalid sample format 
name.

Originally committed as revision 26335 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 20:58:51 +00:00
Ronald S. Bultje
8e8a3cc221 Reindent after 26330. 
Originally committed as revision 26331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 19:31:20 +00:00
Ronald S. Bultje
7f88a5bf9b Introduce av_metadata_copy() to copy metadata from one struct to another. 
Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 19:30:55 +00:00
Baptiste Coudurier
8a774d3deb Do not allocate unused swscale context when libavfilter is compiled in 
Originally committed as revision 26317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 00:52:47 +00:00
Baptiste Coudurier
4618637aca Fix warnings: 
ffmpeg.c: In function ‘new_video_stream’:
ffmpeg.c:3701:18: warning: ‘codec_id’ may be used uninitialized in this function
ffmpeg.c: In function ‘new_audio_stream’:
ffmpeg.c:3848:18: warning: ‘codec_id’ may be used uninitialized in this function
ffmpeg.c: In function ‘new_subtitle_stream’:
ffmpeg.c:3926:18: warning: ‘codec_id’ may be used uninitialized in this function

Originally committed as revision 26313 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 21:16:00 +00:00
Baptiste Coudurier
c961fb3cbb Change 'arg' type in parse_meta_type, fix warning: 
ffmpeg.c: In function ‘parse_meta_type’:
ffmpeg.c:3323:13: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 26312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 21:14:11 +00:00
Anatoly Nenashev
ee77f986a2 Fix lowres > 0 with --enable-avfilter.. 
Fixes issue 2072 and issue 2421.

Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru

Originally committed as revision 26252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 10:16:00 +00:00
Michael Niedermayer
b26847b710 Fix/cleanup m/ljpeg encoding pix fmt selection code in ffmpeg.c. 
Better ideas are welcome ...

Originally committed as revision 26219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 04:52:32 +00:00
Anssi Hannula
ef2b2243dc Use AVOption for muxers in ffmpeg. 
Patch by Anssi Hannula, anssi d hannula d iki d fi

Originally committed as revision 26199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 16:00:47 +00:00
Aurelien Jacobs
1d6233d315 use avsubtitle_free() instead of re-implementing it partially (fix a memleak) 
Originally committed as revision 26175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-31 00:01:37 +00:00
Anton Khirnov
bb62d5c1f0 Allow output formats without any streams. 
Required for future metadata format.

Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:44 +00:00
Stefano Sabatini
f671584845 Reindent. 
Originally committed as revision 25940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-12 16:19:40 +00:00
Stefano Sabatini
8afab68605 Fix encoding when the input audio format/rate/channels changes during 
transcoding.

Fix issue #2292.

Patch sponsored by KIM Keep In Mind GmbH, srl.

Originally committed as revision 25939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-12 16:18:50 +00:00
Justin Ruggles
5d7870dc76 Show per-codec options on FFmpeg commandline help. 
Originally committed as revision 25927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-10 18:25:02 +00:00
Aurelien Jacobs
d4a9f37938 cosmetic: indentation 
Originally committed as revision 25885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 14:47:13 +00:00
Aurelien Jacobs
118ccae030 add subtitle codec autodetection 
Originally committed as revision 25884 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 14:46:13 +00:00
Stefano Sabatini
037be76e15 Add avfilter_graph_create_filter(). 
Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-02 20:12:27 +00:00
Anton Khirnov
477b1aeac9 ffmpeg.c: copy global metadata by default 
Originally committed as revision 25794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-22 07:32:23 +00:00
Stefano Sabatini
63e8d9760f Use the new libavcore audio channel API. 
This also allows to remove a linking dependency of libavfilter on
libavcodec.

Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 20:06:22 +00:00
Baptiste Coudurier
7f48bfa1e3 Cosmetics, fix indentation 
Originally committed as revision 25773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-20 08:03:58 +00:00
Aurelien Jacobs
cb2c971d91 allow passing subtitles header between decoder and encoder 
Originally committed as revision 25745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-13 13:57:49 +00:00
Aurelien Jacobs
8f55616fac add global header support for subtitles encoding 
Originally committed as revision 25742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-13 13:46:36 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Anton Khirnov
09f47fa44e ffmpeg.c: add a forgotten break in chapter copying 
only copy chapters from one file

Originally committed as revision 25729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 06:56:26 +00:00
Anton Khirnov
a9c2bf9dc1 ffmpeg.c: reindent 
Originally committed as revision 25728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 06:56:23 +00:00
Anton Khirnov
91e96ebafb ffmpeg.c: add an option for copying chapters 
fixes issue 2068

Originally committed as revision 25727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 06:56:19 +00:00
Anton Khirnov
7b3937360e ffmpeg.c: allow using negative file indices to disable metadata copying 
Originally committed as revision 25706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-08 06:47:41 +00:00
Stefano Sabatini
1e80a0eaa4 Remove graphparser.h header, move AVFilterInOut and 
avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h.

Simplify, and less confusing for the user.

Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-07 22:56:29 +00:00
Stefano Sabatini
7313132bcc Rename AVFilterInOut field filter to filter_ctx, more semantically correct. 
Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-07 18:40:18 +00:00
Stefano Sabatini
6e872935db Implement get_preset_file() in cmdutils.h and use it to factorize code 
from ffmpeg.c and ffserver.c.

Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 23:07:04 +00:00
Stefano Sabatini
97dd1e4a87 Rename avfilter_graph_destroy() to avfilter_graph_free(). 
The new name is shorter and more consistent with the rest of the API.

This change breaks libavfilter API/ABI.

Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 20:34:24 +00:00
Stefano Sabatini
e15aeea656 Implement avfilter_graph_alloc(). 
Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-04 20:34:19 +00:00
Stefano Sabatini
ba7d6e798e Remove usage of deprecated libavcodec/audioconvert.h functions. 
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:19:34 +00:00
Stefano Sabatini
da1b9b88a5 Fix timestamp computation when the timebase changes during filtering. 
The timestamps for all the buffered frames are scaled against
AV_TIME_BASE_Q, and need to be scaled back to AV_TIME_BASE_Q when they
are extracted from the filterchain.

Originally committed as revision 25646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 18:40:59 +00:00
Anton Khirnov
45290fcdf0 ffmpeg.c: reindent 
Originally committed as revision 25637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 06:12:56 +00:00
Anton Khirnov
d0abe80aa4 ffmpeg.c: don't autocopy stream/chapter metadata if manual mapping is specified 
Originally committed as revision 25636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 06:12:54 +00:00
Anton Khirnov
1829e19528 ffmpeg.c: extend map_meta_data to allow advanced mappings 
i.e. to/from streams/chapters/programs.

Originally committed as revision 25635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 06:01:28 +00:00
Stefano Sabatini
0422af7e49 Remove ffmpeg PGMYUV compatibility hack, which was deprecated since 
ages.

The user is requested to specify "-f image2" in place of "-f pgmyuv"
for reading/writing PGMYUV files, as for the other image formats.

Originally committed as revision 25629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 00:29:13 +00:00
Stefano Sabatini
2839dc974d Use AV_RL32() in opt_codec_tag(). 
Originally committed as revision 25618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-31 22:48:44 +00:00
Ramiro Polla
0d0778b060 ffmpeg: fix opt_codec_tag() return value 
opt_codec_tag() is now used under OPT_FUNC2, which must return a value.

Originally committed as revision 25616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-31 19:55:13 +00:00
Rocky Cardwell
b67f3d6575 Fix ffserver-related regression (and crash) introduced in r25500. 
Fixes issue 2317.

Patch by Rocky Cardwell, rocky d cardwell a lifespringschool d org

Originally committed as revision 25603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 14:54:18 +00:00
Carl Eugen Hoyos
ec1ca41cef Move new_output_stream() up for upcoming fix for issue 2317. 
Originally committed as revision 25602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-29 14:48:38 +00:00
Anton Khirnov
63e856df0a ffmpeg.c: dynamically allocate metadata maps 
Originally committed as revision 25599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-28 20:28:22 +00:00
Stefano Sabatini
d0242e741d Factorize: opt_{audio,video,subtitle}_tag() -> opt_codec_tag(). 
Originally committed as revision 25596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-28 13:20:26 +00:00
Stefano Sabatini
96ea6ad2a7 Remove unused variables picture_crop_temp and picture_pad_temp. 
Originally committed as revision 25530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-20 09:45:50 +00:00
Nicolas George
4ad08021e8 Add a -force_key_frames option to ffmpeg. 
The option is useful to ensure that there is a seek point exactly at a
place the user will probably want to jump precisely sometime, the
major example would be the end of an opening and the beginning of a
chapter. The scene change detection system will often make it happen,
but not always for example if there is a fade-in.

See the thread:
Subject: [FFmpeg-devel] [PATCH] -force_key_frames option
Date: Tue, 12 Oct 2010 15:16:26 +0200

Patch by Nicolas George -mail nicolas,george,normalesup,org.

Originally committed as revision 25526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 21:47:15 +00:00
Stefano Sabatini
ff0652e503 Implement a common get_filtered_video_frame(), shared between ffplay.c 
and ffmpeg.c.

Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:57:11 +00:00
Stefano Sabatini
16b2691346 Make help message for the -crop* options consistent with that of the 
-pad* options and more direct.

Originally committed as revision 25519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:43:07 +00:00
Stefano Sabatini
5879ea6d27 Remove -crop* options. 
Users are required to use the libavfilter crop filter.

Originally committed as revision 25518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-18 13:34:46 +00:00
Stefano Sabatini
3f2a7e4277 Cosmetics: use a more compact notation, improve readability and reduce 
line count.

Originally committed as revision 25510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 20:57:55 +00:00
Stefano Sabatini
dbabc2773a Reset metadata after opt_output_file(), fix the previous commit. 
Spotted by elenril on irc.

Originally committed as revision 25509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 16:16:01 +00:00
Stefano Sabatini
4bf65e2a4d Use an AVMetadata struct for storing metadata, simplify. 
Originally committed as revision 25508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 15:25:02 +00:00
Anton Khirnov
a7e5a832c4 ffmpeg.c/ffprobe.c: remove all uses of av_metadata_conv() 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:04:27 +00:00
Stefano Sabatini
2a24df9357 Add avfilter_graph_config(). 
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:20:53 +00:00
Nicolas George
0b6d358a09 Place the bitstream_filters variable in the AVOutputStream, thus 
greatly simplifying its handling and reducing code duplication.

Patch by Nicolas George -bsf nicolas*george|normalesup+org.

Originally committed as revision 25501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:06:13 +00:00
Nicolas George
9fdf4b5817 Move the allocation of the AVOutputStream structure earlier in the 
code flow, in the new_video_stream() / new_audio_stream() /
new_subtitle_stream() functions.

Patch by Nicolas George <$name.$surname@normalesup.org>.

Originally committed as revision 25500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 10:06:10 +00:00
Stefano Sabatini
f7ead94c69 Factorize definition of the output_filter defined in both ffplay.c and 
ffmpeg.c.
Replace it with a more generic definition which can be shared.

Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:26 +00:00
Stefano Sabatini
94498ec98a Extend buffer source to accept the time base for the output PTS. 
Originally committed as revision 25451 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-12 18:40:20 +00:00
Alexander Strange
0ff4f0c0fc ffmpeg: Use guess_correct_pts() to set decoded picture timestamps 
Originally committed as revision 25431 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-10 02:17:26 +00:00
Aurelien Jacobs
fd0368e7ca move av_find_stream_info() info struct to AVStream to avoid messy (re)allocation 
Originally committed as revision 25418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-08 22:01:19 +00:00
Aurelien Jacobs
ca8064d2d1 fix bitstream filter option mapping when using -newvideo and friends 
There was an off-by-one when addressing bitstream_filters[] in this situation.

Originally committed as revision 25398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 19:25:48 +00:00
Michael Niedermayer
2dec2bb880 Pass RC parameters on stream copy to the muxer. 
Originally committed as revision 25384 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-07 01:57:35 +00:00
Aurelien Jacobs
1136850dd5 cosmetic: break long line 
Originally committed as revision 25377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-06 18:54:10 +00:00
Aurelien Jacobs
6d3421498e ffmpeg: Fix prototype of some OPT_FUNC2 functions. They must return an int. 
Originally committed as revision 25358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 21:05:07 +00:00
Aurelien Jacobs
59ac1da26d cosmetic: break long line 
Originally committed as revision 25329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 20:23:16 +00:00
Reimar Döffinger
a5c33faacc Add init and uninit functions to cmdutils, reduces code duplication 
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.

Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-02 08:44:33 +00:00
Aurelien Jacobs
84fd51e5ad ffmpeg: replace MAX_STREAMS by an arbitrary sanity check 
Originally committed as revision 25304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:56:09 +00:00
Aurelien Jacobs
620a67d56a ffmpeg: dynamically allocate bitstream_filters 
Originally committed as revision 25303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:54:20 +00:00
Aurelien Jacobs
3a8e882419 ffmpeg: dynamically allocate stream_maps 
Originally committed as revision 25302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:52:09 +00:00
Aurelien Jacobs
0a6d97b371 ffmpeg: dynamically allocate output_codecs 
Originally committed as revision 25301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:51:12 +00:00
Aurelien Jacobs
311e223f28 ffmpeg: dynamically allocate input_codecs 
Originally committed as revision 25300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:41:27 +00:00
Aurelien Jacobs
2c6958aabd ffmpeg: dynamically allocate input_files_ts_scale 
Originally committed as revision 25299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:36:13 +00:00
Aurelien Jacobs
e640f26177 ffmpeg: dynamically allocate streamid_map 
Originally committed as revision 25298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:34:59 +00:00
Aurelien Jacobs
dba249abee ffmpeg: add a grow_array() helper function 
Originally committed as revision 25297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 21:29:37 +00:00
Måns Rullgård
b64b4134d5 Rename libavutil/assert.h to avassert.h 
This avoids conflicts with the system assert.h.

Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 13:55:13 +00:00
Michael Niedermayer
b926b6282d av_assert() system. 
With this the developer can now choose if he wants an assert always enabled or at which
compile time assert level. This can thus replace the #define NDEBUG hacks

Originally committed as revision 25278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-30 21:57:31 +00:00
Michael Niedermayer
0093ebc20a User application side of Codec specific parameters. 
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-29 23:06:51 +00:00
Janne Grunau
d04247a134 use strict_std_complience from avcodec_opts[AVMEDIA_TYPE_*] 
Options are not yet set for video encoders and for codec specific
defaults it is desireable to set the codec options only after the codec
is known.

Originally committed as revision 25230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-27 19:59:36 +00:00
Stefano Sabatini
2bc05d3547 Change the syntax of the crop filter from x:y:w:h to w:h:x:y. 
Slightly more intuitive and required by a pending changes for making
the filter parametric.

Originally committed as revision 25184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 23:14:01 +00:00
Michael Niedermayer
3f07e8dbee Doxy consistency cosmetics 
Originally committed as revision 25176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 15:40:53 +00:00
Michael Niedermayer
6b6bca6443 Enable AV_LOG_SKIP_REPEATED to maintain previous behavior. 
Originally committed as revision 25175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 15:39:10 +00:00
Stefano Sabatini
e44c01563f Deprecate av_opt_show() in favor of a new function av_opt_show2(), 
which allows to specify only a subset of all the options to show.

Originally committed as revision 25166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 00:51:40 +00:00
Stefano Sabatini
1790d3b330 Move log_callback_help to cmdutils.[hc], for allowing sharing. 
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-20 21:48:03 +00:00
Justin Ruggles
ff19d16b91 10l: error in last commit. use decoder channels not encoder channels. 
Originally committed as revision 25144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-18 20:19:18 +00:00
Justin Ruggles
37f5a713de Change remaining ost->st->codec and ist->st->codec to enc and dec in 
do_audio_out().

Originally committed as revision 25143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-18 20:16:56 +00:00
Martin Storsjö
2dfa7c72ce Update the audio sample rate when doing lowres audio decoding, before opening the decoder 
Originally committed as revision 25090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-09 20:58:13 +00:00
Stefano Sabatini
37b9706123 Factorize opt_new_{audio,video,subtitle} definitions. 
Originally committed as revision 24905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:48:20 +00:00
Stefano Sabatini
dfd5775735 Cosmetics: rename out_video_filter to output_video_filter, for 
consistency with input_video_filter.

Originally committed as revision 24904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:48:17 +00:00
Stefano Sabatini
4ddf0d2915 Make configure_filters() return a meaningful error code rather than 
always -1.

Originally committed as revision 24903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 15:48:11 +00:00
Ramiro Polla
3f1710e74f indent 
Originally committed as revision 24894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-24 00:46:32 +00:00
Vitor Sessak
c4ab519e00 Make "-fs ss" mean "make output file of size equals or less than ss" 
instead of current "make output file of size less than ss".

Also use it to make MP3 tests more readable (using -fs xxx where xxx is
the requested output size, not something slightly lower).

Originally committed as revision 24884 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-23 14:46:59 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from: 
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 11:44:51 +00:00
S.N. Hemanth Meenakshisundaram
cc80caff52 Separate video specific BufferRef properties into VideoProps. 
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.

Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.

Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-11 11:06:04 +00:00
S.N. Hemanth Meenakshisundaram
5d4890d73d Rename fields: 
AVFilterLink.srcpic    ->  AVFilterLink.src_buf
AVFilterLink.cur_pic   ->  AVFilterLink.cur_buf
AVFilterLink.outpic    ->  AVFilterLink.out_buf

The new names are more generic and more consistent, since the struct
they contain, which was named AVFilterPicRef, has been renamed to
AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%.

Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:34 +00:00
S.N. Hemanth Meenakshisundaram
7fce481a69 Rename functions and fields: 
avfilter_(un)ref_pic       -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic      -> AVFilterBufferRef.buffer

They have been renamed to allow sharing with audio.

Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.

Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:27 +00:00
S.N. Hemanth Meenakshisundaram
ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef. 
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:19 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate() 
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 23:12:28 +00:00
Stefano Sabatini
065a20cb07 Reindent. 
Originally committed as revision 24506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 13:39:49 +00:00
Stefano Sabatini
3aace1bcac Rename av_transcode() to transcode(). 
av_ prefix is reserved for libav* libraries functions, it is confusing
to use it for an application function.

Originally committed as revision 24505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 13:39:41 +00:00
Stefano Sabatini
639e4ec81b Rename av_exit() to ffmpeg_exit(). 
av_ is a prefix reserved for av* libraries functions, using that for an
application function is confusing.

Originally committed as revision 24497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:42:32 +00:00
Stefano Sabatini
f62c025a5e Use X ? Y : Z construct, simplify. 
Originally committed as revision 24496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:41:06 +00:00
Stefano Sabatini
f7bd4a8ebd Cosmetics: rename enc -> dec in opt_input_file(). 
The variable refer to a *decoder* context, the old name was
misleading.

Originally committed as revision 24492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 10:42:00 +00:00
Jai Menon
d62ccec8b1 FFmpeg : Replace some av_exit calls in av_transcode with branches to the 
cleanup code.

This plugs a bunch of memleaks.

Originally committed as revision 24305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 18:20:41 +00:00
Jai Menon
961e4a3389 FFmpeg : Close input file and free any related memory if 
av_find_stream_info fails.

Originally committed as revision 24247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-15 11:53:34 +00:00
Michael Niedermayer
748db0fcc4 Move frame_available computation to where it belongs in ffmpeg.c. 
This fixes a infinite loop.
Fixes issue 2066.

Originally committed as revision 24058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-05 14:49:48 +00:00
Stefano Sabatini
9f434b6584 Make opt_pad() print more information. 
Originally committed as revision 24050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-04 20:59:02 +00:00
Stefano Sabatini
74dc99f2b3 Update help message for the -pad* options, as they have been removed, 
and update the manual page accordingly.

Based on a patch by John Calcote $(echo "<kpio.dbmdpuf@hnbjm.dpn>" | tr "b-za" "a-z").

Originally committed as revision 24049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-04 20:59:00 +00:00
Baptiste Coudurier
3c5e1b36d5 LOL, 100l, really fix warning: 
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 23:24:37 +00:00
Baptiste Coudurier
947cbeca16 Fix warning: 
ffmpeg.c: In function 'new_audio_stream':
ffmpeg.c:665: warning: 'best' may be used uninitialized in this function
ffmpeg.c:665: note: 'best' was declared here

Originally committed as revision 24033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 23:22:25 +00:00
Rodney Baker
2d525ef483 Change all occurences of "inofficial" to "unofficial" in code, comments 
and options. Keep old options until next major version bump.

Patch by Rodney Baker, rodney d baker a iinet d net d au

Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 15:35:23 +00:00
Baptiste Coudurier
8abcbf2d54 Reduce codec time base when stream copying 
Originally committed as revision 24019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 10:12:22 +00:00
Baptiste Coudurier
f96363df7a Set graph swscale opts before parsing it, that way opts are available 
when auto-adding scalers.

Originally committed as revision 24015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-03 03:11:04 +00:00
Stefano Sabatini
2b4abbd6f5 Move colorspace.h from libavcodec to libavutil. 
Avoid a compile-time dependency of the pad filter on libavcodec.

Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 18:49:44 +00:00
Mike Scheutzow
006e8108de Add new option "streamid" to set the value of an outfile streamid. 
Patch by Mike Scheutzow, scheutzow alcatel-lucent com

Originally committed as revision 23917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 22:35:57 +00:00
Måns Rullgård
2829ce4b40 Remove PPC perf counter support 
This functionality is better accessed through tools like oprofile.

Originally committed as revision 23808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-26 22:23:35 +00:00
Stefano Sabatini
25d3445811 Rename rec_timestamp to recording_timestamp, for consistency with 
recording_time.

Originally committed as revision 23727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 22:54:39 +00:00
Alexander Strange
28db32159e ffmpeg: cosmetics: combine two variable declarations 
Originally committed as revision 23677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-21 04:15:18 +00:00
Michael Niedermayer
54a13282bd Deprecate -crop* arguments, they currently are buggy (issue1957) and probably 
will be fixed by removing them.

Originally committed as revision 23607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-14 17:35:46 +00:00
Justin Ruggles
e91376d1f6 10l: audio_buf is already a uint8_t* so no need to cast it 
Originally committed as revision 23571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 19:50:14 +00:00
Justin Ruggles
79c85beba8 Allocate enough memory for audio_buf to fit a full output frame. 
Also, use audio_buf when encoding the final frame.
Fixes Issue 1921.

Originally committed as revision 23570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 19:40:56 +00:00
Diego Biurrun
a1629e2848 Remove support for pre-Haiku, non-POSIX, non-C99 BeOS variants. 
BeOS support has been broken for many years and the "maintainer" of the port
has not reacted to countless requests to get the port fixed.
approved by Mans

Originally committed as revision 23562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-10 16:51:14 +00:00
Luca Abeni
b659c8b4b7 In case of stream copy, copy the extradata from the input codec context to 
the output codec context (instead of just copying a pointer to the extradata).

Originally committed as revision 23538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 19:27:29 +00:00
Stefano Sabatini
83a36b2e0b Change type of {audio,video,subtitle}_codec_tag variables from int to 
unsigned int, as the corresponding variable set in
AVCodecContext.codec_tag is unsigned int.

Originally committed as revision 23441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-03 18:40:31 +00:00
Janne Grunau
770e50ae80 ffmpeg: offer alternatives for experimental codecs if they exist 
Originally committed as revision 23398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-31 22:35:14 +00:00
Janne Grunau
4e605bc3fd ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental 
Originally committed as revision 23397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-31 22:31:51 +00:00
Ramiro Polla
c56e9e05ab Open 2-pass logfile in binary mode for both reading and writing. 
This fixes a regression on Windows introduced by r22769 in which the data read
from the file was not properly zero terminated. The file was read as text,
which caused the \r characters to be suppressed. Since the zero termination
happens at the end of the buffer, and there was one byte less read per line,
this caused the remaining space on the buffer to contain random data.

Originally committed as revision 23251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-22 21:32:57 +00:00
Baptiste Coudurier
521cfa4aae rename -vfilters cli option to -vf 
Originally committed as revision 23100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-12 01:47:14 +00:00
Baptiste Coudurier
d21f58b52d cosmetics, rename loop to frame_available 
Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:25:18 +00:00
Baptiste Coudurier
a9f3cb9372 rename curr_filter to last_filter, factorize filter declaration 
Originally committed as revision 23091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:23:06 +00:00
Baptiste Coudurier
79b90b2549 cosmetics: indentation, whitespaces 
Originally committed as revision 23090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:18:13 +00:00
Baptiste Coudurier
6e82e7fa48 simplify, reuse existing args variable 
Originally committed as revision 23089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:16:52 +00:00
Baptiste Coudurier
aa1249b8aa cosmetics: filt_graph_all -> graph, like in ffplay.c 
Originally committed as revision 23088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-11 17:14:36 +00:00
Michael Niedermayer
0c22311b56 Remove messy pading hack in ffmpeg.c. 
Use avfilters if you want padding!

Originally committed as revision 23050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 12:16:23 +00:00
Michael Niedermayer
bdab692f48 Make sure get_filtered_video_pic() doesnt loose interlacedframe/tff. 
Originally committed as revision 23049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 12:05:24 +00:00
Michael Niedermayer
46847a336e avfilter support for ffmpeg 
Originally committed as revision 23043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-07 09:43:21 +00:00
Michael Niedermayer
ff866063e9 Print warnig if requested samplingrate is unsupported. 
Originally committed as revision 22991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-30 00:06:36 +00:00
Stefano Sabatini
a31e795607 Make ffmpeg use print_error() to make apparent the exact cause of 
failure happened when trying to open the output file.

Originally committed as revision 22973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 22:36:55 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Michael Niedermayer
10d0f5e035 Make sure ffmpeg chooses a supported samplerte if the encoder supports 
just some.

Originally committed as revision 22943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 09:40:51 +00:00
Cyril Russo
9b157b0ccd Fix compilation error of ffmpeg and ffplay with --disable-avdevice. 
Patch by Cyril Russo, stage D nexvision A laposte net

Originally committed as revision 22940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 08:55:23 +00:00
Robert Krüger
2328e5a289 Allow setting the environment variable FFMPEG_DATADIR to locate preset files. 
Patch by Robert Krüger <krueger signal7 de>.

Originally committed as revision 22923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 17:37:06 +00:00
Baptiste Coudurier
f32f7d8b24 Take ticks per frame into account when warning about difference between 
container and codec frame rate.

Originally committed as revision 22895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-16 22:58:56 +00:00
Anton Khirnov
46e6fb4c54 Simplify writing stream metadata. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 19:54:11 +00:00
Anton Khirnov
1a6498d78c Don't overwrite user-supplied metadata with metadata mapped from an input file. 
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-05 19:53:25 +00:00
Stefano Sabatini
685598f58d Reindent. 
Originally committed as revision 22798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 13:50:38 +00:00
Stefano Sabatini
ac61f59a76 Rename av_encode() to av_transcode(), the new name is more meaningful. 
Originally committed as revision 22797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-04 13:50:34 +00:00
Carl Eugen Hoyos
18590be655 Use AVDISCARD_DEFAULT for 0 where appropriate. 
Originally committed as revision 22787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 23:08:23 +00:00
Stefano Sabatini
458b062d61 Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading 
the second pass encoding log file.

Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 22:34:22 +00:00
Ronald S. Bultje
d9521cb119 Fix FFM-based streaming from ffmpeg to ffserver. The basic problem is that 
we'd memset() the codec context to zero, thereby setting audio input to U8
and video to YUV420P. For most video encoders, that actually works, but for
most audio codecs, it doesn't. This patch changes defaults to those set by
avcodec_context_get_defaults() and have ffmpeg figure out the optimal encoding
format itself if not set explicitely (as it does for the non-ffserver-cases
also).

Originally committed as revision 22751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 21:02:34 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Ronald S. Bultje
aa1de0d9ed Split out code that auto-chooses a default pix_fmt/sample_fmt in their own 
functions.

Originally committed as revision 22731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 19:37:07 +00:00
Måns Rullgård
64f6e357fd 10l: fix build without termios.h 
Originally committed as revision 22604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 01:02:45 +00:00
Måns Rullgård
9a9509e6ee Register atexit handler only when needed 
Originally committed as revision 22599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-19 16:25:11 +00:00
Anton Khirnov
7a39f142a8 ffmpeg.c: copy chapters by default. 
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-19 07:44:38 +00:00
Ronald S. Bultje
562f22a699 Typo: if output (video) stream's pix_fmt is not set, then the stream cannot 
be ENcoded, not DEcoded.

Originally committed as revision 22566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-16 15:48:48 +00:00
Michael Niedermayer
802323508c Allow mpeg style yuv in jpeg when strict standard compliance is small enough. 
Originally committed as revision 22553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 19:45:57 +00:00
Alexander Strange
d55065a29f ffmpeg: Combine variable declaration and definition 
Originally committed as revision 22537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 02:33:49 +00:00
Alexander Strange
47b229dbab ffmpeg: Factor out redundant sync_ipts calculation 
Originally committed as revision 22536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-15 02:32:21 +00:00
Måns Rullgård
335ee1aadd Move libm replacements to new header libm.h 
ffmpeg.c uses lrintf(), which is missing on some systems.  Previously
it picked up the replacement via libavutil/internal.h due to
HAVE_AV_CONFIG_H being erroneously defined.

Moving these replacements to a separate header enables ffmpeg.c to
use them without being exposed to internal interfaces.

This use of a non-public header is justified by the header in question
not being part of the internal interface either.  It should rather be
considered as part of the build system, which is shared between the
libraries and the applications.

This header cannot be installed since the tested conditions depend on
the compiler.

Originally committed as revision 22399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 15:10:23 +00:00
Måns Rullgård
6580d5e377 Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps 
Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-07 22:18:37 +00:00
Alex Converse
660822f0ae ffmpeg.c: Don't use NULL for integer metadata flags. 
Originally committed as revision 22205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 11:27:39 +00:00
Stefano Sabatini
8c8bf9ecfc Make ffmpeg print a message and abort if the name of the format 
provided with -f was unknown.

Originally committed as revision 22140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-02 00:01:16 +00:00
Chris Stones
49b609820d Don't let output pixel format influence input pixel format. 
Patch by Chris Stones,  chris D stones A gmail

Originally committed as revision 22130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 16:47:44 +00:00
Anton Khirnov
c71591a509 ffmpeg: copy stream metadata. 
Patch by Anton Khirnov wyskasgmailcom

Originally committed as revision 22126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-01 07:22:59 +00:00
Francesco Cosoleto
6abda15f56 Prevent overflow of start_time + recording_time. 
Patch by Francesco Cosoleto gmail($name)

Originally committed as revision 22077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 14:46:20 +00:00
Michael Niedermayer
a15fdd7ce3 Attempt to fix issue1728 and regression of issue203 
Originally committed as revision 22011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 23:41:11 +00:00
Michael Niedermayer
b8c93c483b Set ist->pts to something that isnt guranteed to entangle itself with stream copying b frames. 
Originally committed as revision 22010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 22:06:36 +00:00
Michael Niedermayer
247e3954fc Favor streams with more packets if the user did not specify what she wants. 
Fixes issue1156

Originally committed as revision 22002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 16:31:14 +00:00
Michael Niedermayer
6d3d3b836f Redesign opt_programid code. 
Its now possible to also select programs per input file and there is
less code duplication.

Originally committed as revision 21999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 15:08:41 +00:00
Reimar Döffinger
fc5607f862 Make -benchmark also print the maximum memory usage if possible. 
Originally committed as revision 21973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 22:21:58 +00:00
Wolfram Gloger
23b361baca Remove recording_time check which is no longer necessary after r21687. 
Patch by Wolfram Gloger, wmglo A dent D med D uni-muenchen D de

Originally committed as revision 21760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 21:54:09 +00:00
Reimar Döffinger
40938d9382 Use av_compare_ts to compare against the -t end time instead of using 
floating point.
Should fix different results between PPC and x86 for the idroq-video-encode
FATE test.

Originally committed as revision 21745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 19:46:44 +00:00
Wolfram Gloger
55a7e946f6 Stop reading input file when -t option value is reached. 
Patch by Wolfram Gloger wmglo (chez) dent med uni (minus) muenchen de

Originally committed as revision 21687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 09:04:06 +00:00
Justin Johnson
86a4f011e6 Revert r21615 | cehoyos | 2010-02-02 23:23:09 +0100 (Tue, 02 Feb 2010) | 5 lines 
Guess the duration before converting video and write guessed duration
	into flv header.
	Patch by Justin Johnson, justin D johnson3 A gmail

The change to ffmpeg.c is wrong as input and output files arent connected 1:1
(i seem to have missed that)
Also it can segfault see ([FFmpeg-devel] rtp streaming x264+audio issues (and some ideas to fix them))

Originally committed as revision 21652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 11:11:10 +00:00
Stefano Sabatini
6e2fdc3eb1 Add parentheses in boolean expression: (A && B || C) => ((A && B) || C), 
fix the warning:
ffmpeg.c: In function ‘output_packet’:
ffmpeg.c:1317: warning: suggest parentheses around && within ||

Originally committed as revision 21650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 00:10:42 +00:00
Stefano Sabatini
cedac88250 Make opt_frame_pix_fmt() call show_pix_fmts() if the provided option 
is "list".

Originally committed as revision 21628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 19:55:45 +00:00
Michael Niedermayer
f575f08ccb Correct opts calulation in ffmpeg.c. 
This correct the stop point for demuxing with -vcodec copy and -t as well as
packet interleaving. (we already diddrop packets but kept demuxing them
for too long due to opts being wrong)
the change to ffm is due to 2 packets with timestamp 0 being stored
in different order.

Originally committed as revision 21626 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 15:09:04 +00:00
Michael Niedermayer
5bfe91e683 Alternative solution for the mpegvideo_split + mov problem. 
Originally committed as revision 21625 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-03 14:53:14 +00:00
Justin Johnson
c5e1e9827d Guess the duration before converting video and write guessed duration 
into flv header.

Patch by Justin Johnson, justin D johnson3 A gmail

Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-02 22:23:09 +00:00
Michael Niedermayer
f8ccf72005 Check pkt.pts against the recording time. 
This fixes at least ogg encoding with -t where the file was slightly too long.

Originally committed as revision 21598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-01 22:08:45 +00:00
Stefano Sabatini
718c7b18c9 Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt() 
function.

Originally committed as revision 21550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-30 19:10:26 +00:00
Jai Menon
ecc544debd ffmpeg.c : Don't set AVFormatParameters::[audio|video]_codec_id 
since it is no longer required.

Originally committed as revision 21513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-28 16:17:52 +00:00
Jai Menon
60402344af ffmpeg.c : Increase static limit on the maximum number of 
input files.

Originally committed as revision 21483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 19:11:31 +00:00
Michael Niedermayer
3ff0daf06d Print "Multiple frames in a packet" warning independant of CODEC_CAP_SUBFRAMES 
because CODEC_CAP_SUBFRAMES is primarely misused to hide this warning otherwise
which renders the flag completely useless.

Originally committed as revision 21480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 13:27:18 +00:00
Michael Niedermayer
7a086a852c Fix heap overflow with -async. 
Fixes issue1666

Originally committed as revision 21390 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 01:25:19 +00:00
Måns Rullgård
40ccc754e9 Indent 
Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 22:55:55 +00:00
Måns Rullgård
68cf92ee5e Always call avcodec_thread_init() 
The various avcodec_thread_init() functions are updated to return
immediately after setting avctx->thread_count.  This allows -threads 0
to pass through to codecs.  It also simplifies the usage for apps
using libavcodec.

Originally committed as revision 21358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 22:55:50 +00:00
Måns Rullgård
ffcc6e24f5 Add -timelimit option 
This option limits the CPU time used by ffmpeg to the number of seconds
specified.  After this time, the OS sends a SIGXCPU signal, which we
handle and attempt to exit cleanly.  If the process is stuck, the OS
will deliver a SIGKILL one second later, forcibly terminating the
process.

This functionality is useful in automated setups where a runaway ffmpeg
process would otherwise go undetected.

Originally committed as revision 21347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 06:42:39 +00:00
Michael Niedermayer
036c1382a7 Fix stream copy & transcoding one stream at the same time. 
Fixes issue1660.

Originally committed as revision 21042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 01:15:16 +00:00
Michael Niedermayer
9f907d853f Correct indention. 
Originally committed as revision 21041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 00:50:34 +00:00
Michael Niedermayer
8157483d64 Move the definitions of data_buf and data_size closer to where they are used. 
Originally committed as revision 21040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 00:47:23 +00:00
Stefano Sabatini
0f52ef1a00 Use av_guess_format() in place of the deprecated guess_format(). 
Originally committed as revision 20994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-01 12:58:03 +00:00
Michael Dorr
322aa1e2d8 Do not explicitely set thread_count in the codec context. 
This is already done by avcodec_thread_init().

Patch by Michael Dorr <dorr <at> inb.uni-luebeck.de>.

Originally committed as revision 20955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-28 22:46:46 +00:00
Michael Niedermayer
37ce3d6ba7 Do not copy codec_tag in stream copy case if it is associated with a different codec_id 
fixes issue1568

Originally committed as revision 20921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-25 21:01:16 +00:00
Stefano Sabatini
a6831e885c Use positive logic, improve readability, consistent with r20877. 
Originally committed as revision 20920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-25 18:32:16 +00:00
Ramiro Polla
7f11e745b2 Print usage instead of help when no files are specified. 
Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:15:46 +00:00
Ramiro Polla
0c2a18cbcd Split show_usage() out of show_help(). 
Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:12:34 +00:00
Ramiro Polla
8319aefeec Add a general [options] to the basic usage string. 
Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:10:14 +00:00
Ramiro Polla
27daa420fc First print the program description and then the basic usage line. 
Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-21 02:09:17 +00:00
Matthieu Crapet
0fc2c0f618 Add -vlang option to set ISO 639 video stream language code. 
This is similar to existing -alang & -slang options.

Patch by Matthieu Crapet m${surname} ^ gmail com.

Originally committed as revision 20880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-16 12:08:01 +00:00
Stefano Sabatini
06a3c9c45a Use positive logic in opt_target() for selecting the PAL/others 
options, make its semantics mildly easier to compile by human minds.

Originally committed as revision 20877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-15 23:25:16 +00:00
Matthieu Crapet
e6db28ceb2 Simplify freeing of audio_language and subtitle_language. 
Patch by Matthieu, mcrapet gmail com

Originally committed as revision 20875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-15 20:36:14 +00:00
Stefano Sabatini
01558ee6c9 Use symbolic names for PAL/NTSC/FILM rather than numeric constants in opt_target(). 
Improve readability.

Originally committed as revision 20870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 23:18:49 +00:00
Vitor Sessak
8b484d0f07 Correct typo 
Originally committed as revision 20868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 19:28:33 +00:00
Michael Niedermayer
0f649d667e Include dup/drop info if any frames where duplicated or droped 
instead of when verbose>1.
From ffmbc0.3

Originally committed as revision 20865 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 12:40:10 +00:00
Michael Niedermayer
ed30e518e3 Off by 1 bugfix for nb_frames_dup. 
From ffmbc0.3

Originally committed as revision 20864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 12:37:24 +00:00
Michael Niedermayer
22b16e6a5d Factorize ic->streams[i] out, 
change from ffmbc

Originally committed as revision 20852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 03:23:45 +00:00
Michael Niedermayer
e4637d6a60 Show help if no cmd line options are provided at all. 
This safes the users time to find out which of -h --help -? works.

Originally committed as revision 20822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 13:49:14 +00:00
Stefano Sabatini
c5dc602600 Move list_fmts() from ffmpeg.c to cmdutils.{h,c}, so that it can be 
shared by the other ff* tools code.

Originally committed as revision 20812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 17:45:20 +00:00
Michael Niedermayer
e185a2f649 Do as the comment says and signal an error. 
Originally committed as revision 20770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:50:46 +00:00
Michael Niedermayer
b8919a3092 10l bug, use av_fast_malloc() instead if av_malloc() for allocating audio 
buffers.
This and the previous revision fix a heap overflow.

Originally committed as revision 20769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:48:36 +00:00
Michael Niedermayer
15bfe412b7 Try to allocate audio buffer sizes depending on the number of input bytes. 
Fixes issue1167.

Originally committed as revision 20768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:28:28 +00:00
Michael Niedermayer
5ee05a62f9 Check that the buffer size speified to avcodec_encode_audio() is not larger than the actual size. 
Originally committed as revision 20767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:18:15 +00:00
Michael Niedermayer
060b8592d2 Do not assume that av_get_bits_per_sample() is a multiple of 8. 
Originally committed as revision 20766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 14:10:49 +00:00
Michael Niedermayer
80f4725060 Get rid of audio_out2, it seems unneeded. 
Originally committed as revision 20760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-07 16:26:37 +00:00
Jai Menon
3394653306 Update frame_width and frame_height based on the lowres value. 
Fixes issues 1387, 1097 and probably some other lowres related problems.

Originally committed as revision 20741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-05 17:51:00 +00:00
Stefano Sabatini
ef6fc64762 Add 'const' attribute to the last_asked_format variable, fix a 
compiler warning.

Originally committed as revision 20740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-05 15:14:01 +00:00
Michael Niedermayer
b83ccbffe9 Do not crash on frame size changes. 
Fixes issue1481.

Originally committed as revision 20730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 16:20:00 +00:00
Ramiro Polla
15e65f83ec Update help text for -fpre option to make it a little less confusing. 
Originally committed as revision 20713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-03 00:55:52 +00:00
Stefano Sabatini
992f8eaee7 Factorize common commandline options definition. 
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-29 23:12:19 +00:00
Michael Niedermayer
bc7eb330e3 Remove "frame size must be a multiple of 2" check. 
This check only caught explicitly set sizes from the cmd line and overriding
the users wish seems silly, especially as it seems to work.

Originally committed as revision 20634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-27 20:20:44 +00:00
Michael Niedermayer
9ff261a2b2 Remove special case that changed video sync behavior for av_q2d(enc->time_base) <= 0.001. 
This should make the default behave more like one would expect and not
change behavior at 1000fps.

Originally committed as revision 20615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-25 23:33:47 +00:00
Michael Niedermayer
8447f0bd74 Split show_formats(). 
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 16:35:55 +00:00
Ramiro Polla
200267333c Indent. 
Originally committed as revision 20436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 23:44:11 +00:00
Ramiro Polla
a75e103432 Add -fpre option to take a preset file as parameter. The -[avs]pre options no 
longer accept filenames, and -fpre should be used instead.

Originally committed as revision 20435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-02 23:41:54 +00:00
Etienne Buira
a5abfd8fd1 Issue an error when forced format cannot be honored. 
Patch by Etienne Buira $name $surname lists chez free.fr

Originally committed as revision 20417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-30 09:57:34 +00:00
Stefano Sabatini
43d160fd00 Prefer "loglevel" over "logging level number or string" as argname of 
the loglevel command line option.

Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages.

Originally committed as revision 20149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 19:06:27 +00:00
Sascha Sommer
d859bb1db0 Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes 
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)

Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 15:08:26 +00:00
Sascha Sommer
9d66ef18fa fix PTS calculation for audio formats with bits per sample != 16 
Originally committed as revision 19880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 12:45:24 +00:00
Ramiro Polla
7ef618796a Check for return value of some context allocations. 
Originally committed as revision 19826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-12 17:22:56 +00:00
Reimar Döffinger
7f4fca038d Increase maximum encoded subtitle size from 64 kB to 1 MB. 
Fixes "dvd_subtitle too big" errors when encoding HD video subtitles
to DVD format.

Originally committed as revision 19713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 10:22:27 +00:00
Reimar Döffinger
8b03c014f0 Make sure that start_display_time is 0 by moving its value onto pts. 
If it was not 0, subtitle encoding would fail.

Originally committed as revision 19710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 08:43:11 +00:00
Reimar Döffinger
266649a52f 100l, error out if subtitle encoder failed instead of writing an AVPacket 
with ridiculous size and thus crashing.

Originally committed as revision 19641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-15 00:37:31 +00:00
Diego Biurrun
966116b9f7 Remove some hunks of unused and disabled code cruft. 
Originally committed as revision 19606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-07 14:53:31 +00:00
Martin Storsjö
e9a832e508 Change type of received_sigterm variable from sig_atomic_t to int, 
which is more portable (works on Windows CE).
patch by Martin Storsjö, martin martin st

Originally committed as revision 19515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-27 13:01:44 +00:00
Martin Storsjö
a2f4324bb6 Check for HAVE_ISATTY. 
Patch by Martin Storsjö <martin at martin dot st>

Originally committed as revision 19505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-24 00:13:59 +00:00
Lou Logan
64cd805071 Rename invalid option name "gop" to "g" in opt_target(), so that 
-target *-dvd works correctly.

Patch by Lou Logan <$firstname@fakeoutdoorsman com>.

Originally committed as revision 19447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-16 22:32:41 +00:00
Carl Eugen Hoyos
340e230392 Use enum CodecID instead of int. 
Fixes the following icc warning:
warning #188: enumerated type mixed with another type

Originally committed as revision 19340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 08:18:03 +00:00
Jason Garrett-Glaser
01a3c821a2 Handle variable input stream pixfmts using the same framework introduced 
by the variable frame size patch.  Fixes at least issue 1165.

Originally committed as revision 19279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-26 01:08:26 +00:00
Baptiste Coudurier
f356fc5799 clarify encoder and decoder opening error messages 
Originally committed as revision 19243 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-21 01:59:05 +00:00
Eric Buehl
352666c17c Support varying frame sizes in a single file. 
patch by Eric Buehl, eric.buehl gmail com

Originally committed as revision 19226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 14:43:36 +00:00
Reimar Döffinger
4bbe788ab7 Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder 
should use it, too).

Originally committed as revision 19221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 08:28:07 +00:00
Stefano Sabatini
4c97a6fafa Move opt_loglevel() from ffmpeg.c to cmdutils.c. 
Originally committed as revision 19209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-16 23:09:03 +00:00
Ramiro Polla
77ddf4df94 Make ffmpeg able to set the loglevel option using strings 
corresponding to the various log levels.

Patch by Ramiro.

Originally committed as revision 19208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-16 23:02:53 +00:00
Baptiste Coudurier
d310d56a36 do not use av_parser_change for h264 which uses bitstream filter, fix #1027 
Originally committed as revision 19196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-14 23:55:25 +00:00
Måns Rullgård
50f3fabc48 Print error message when output buffer allocation fails 
Originally committed as revision 19194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-14 23:14:54 +00:00
Baptiste Coudurier
761c8c923e Fail and print correct error message when video stream pixel format 
is unknown.

Originally committed as revision 19164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 08:15:37 +00:00
Baptiste Coudurier
aa9b754ffc Remove even condition on pad and crop. 
Odd padding or cropping is needed when encoders only support
even resolution.

Originally committed as revision 19146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-11 04:07:29 +00:00
Ramiro Polla
9e1cc5984c indent 
Originally committed as revision 19071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 20:19:16 +00:00
Ramiro Polla
851218584e Remove useless if(), leftover from the vhook removal. 
Originally committed as revision 19070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-31 20:17:58 +00:00
Baptiste Coudurier
54e28a852c remove commented code using real_pict_num 
Originally committed as revision 18989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-30 02:48:47 +00:00
Baptiste Coudurier
b10d7e4e3a pad last audio frame when encoding 
Originally committed as revision 18907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-23 04:07:25 +00:00
Stefano Sabatini
ecfe3929da Remove duplicated RGB_TO_[YUV] macros, use those included in 
libavcodec/colorspace.h.

Originally committed as revision 18901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-22 22:51:46 +00:00
David Conrad
de96180137 Copy input codec's chroma_sample_location to output codec when transcoding. 
Currently only used by yuv4mpeg.

Originally committed as revision 18799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-12 00:47:19 +00:00
Benoit Fouet
80b9d6366f Make function pointer assignments consistent in option handling. 
Originally committed as revision 18697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-27 07:13:50 +00:00
Wolfram Gloger
4eac2e8901 Change return type of opt_loglevel() from void to int. 
Patch by Wolfram Gloger: wmglo (your at here) dent med uni (minus) muenchen de

Originally committed as revision 18678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-24 11:56:23 +00:00
Michael Niedermayer
a39b76ea7d Don't loose bits_per_raw_sample when transcoding. 
Originally committed as revision 18671 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-23 23:30:16 +00:00
Justin Ruggles
be233a5691 Check that channel layout is compatible with number of channels for 
output audio stream.

Originally committed as revision 18621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-19 14:05:55 +00:00
Michael Niedermayer
b716c6c6a6 Remove unneeded assignment from av_encode() found by CSA. 
Originally committed as revision 18567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 15:33:45 +00:00
Michael Niedermayer
b5ee9c2334 Remove unused variable from print_report() found by CSA. 
Originally committed as revision 18566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 15:15:25 +00:00
Michael Niedermayer
505b6d1147 Remove unneeded assignment in ffmpeg.c found by CSA. 
Originally committed as revision 18562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 15:03:51 +00:00
Justin Ruggles
22c4c3e059 Support audio sample formats than S16 when encoding a small last frame. 
Originally committed as revision 18505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-14 03:48:26 +00:00
Baptiste Coudurier
7c8689ef54 set pkt duration for last smaller frame, should fix alac in m4a muxing 
Originally committed as revision 18504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-14 00:20:52 +00:00
Baptiste Coudurier
c573eb85f0 fix indentation 
Originally committed as revision 18500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 21:22:19 +00:00
Baptiste Coudurier
3321cb3f6e move audio buffers declarations and free them in av_exit 
Originally committed as revision 18486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 03:55:26 +00:00
Baptiste Coudurier
5973490a8f move freeing code before exiting because of signal 
Originally committed as revision 18485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 03:47:12 +00:00
Baptiste Coudurier
3b80107596 free options contexts in av_exit, valgrind should be happy now 
Originally committed as revision 18484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 03:43:29 +00:00
Thilo Borgmann
031e14ea79 Fix initialization of avpkt in output_packet(). 
Patch by Thilo Borgmann thilo.surname AT googlemaildotcom.

Originally committed as revision 18451 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 22:04:52 +00:00
Thilo Borgmann
ede0e47507 Use the new avcodec_decode_* API. 
Patch by Thilo Borgmann th_lo.borgm_n_@goog_email.co_.

Originally committed as revision 18417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 12:53:22 +00:00
Michael Niedermayer
cdf38a17fb Fix -ss / -t interaction with -acodec copy. 
Fixes issue203

Originally committed as revision 18382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 00:13:59 +00:00
Baptiste Coudurier
b9edbe9953 do not write ffm write index by default, detect if file is being written and return EOF 
Originally committed as revision 18063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 01:23:33 +00:00
Stefano Sabatini
90da2b5086 Make ffmpeg fail if the argument provided to the -pix_fmt option is 
invalid.

Originally committed as revision 18053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 22:29:32 +00:00
Stefano Sabatini
29c6638668 Use read_yesno() in opt_output_file(). 
Originally committed as revision 18038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 21:38:41 +00:00
Stefano Sabatini
eab5168cd3 Flush the remaning chars in the input buffer after reading the 
response to the "Overwrite ? [y/N]" question.

Fix the behaviour when the question is asked more than one time.

Originally committed as revision 18036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 21:34:19 +00:00
Baptiste Coudurier
3d45a83a59 add loglevel option to set libav* logging level, -v does not set it anymore 
Originally committed as revision 17973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 07:23:18 +00:00
Baptiste Coudurier
27ad7d3a96 stag option to force subtitle tag 
Originally committed as revision 17941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:14:19 +00:00
Baptiste Coudurier
00b7fbdcf5 10l, set ret to 0 when finished 
Originally committed as revision 17931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:13:14 +00:00
Baptiste Coudurier
002c95d749 dump_format after av_write_header to print updated parameters 
Originally committed as revision 17930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:06:18 +00:00
Reimar Döffinger
3898eed890 Reorder arguments for av_fifo_generic_read to be more logical and 
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 17:47:47 +00:00
Reimar Döffinger
c957c85426 Replace all uses of the replaced av_fifo_read by av_fifo_generic_read 
Originally committed as revision 17873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 14:42:11 +00:00
Michael Niedermayer
41dd680dd8 Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues. 
Yes this breaks ABI/API but ive already broken it and will bump avutil major
soon.

Originally committed as revision 17869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 14:16:55 +00:00
Stefano Sabatini
636f1c4cd0 Rename avctx_opts to avcodec_opts. 
The new name is more meaningful and consistent with avformat_opts
and sws_opts.

Originally committed as revision 17789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 23:32:10 +00:00
Michael Niedermayer
1ad1eaadd6 Enable AVFMT_FLAG_NONBLOCK. 
Originally committed as revision 17785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 20:25:21 +00:00
Michael Niedermayer
d61f30a7a0 Do usleep(10000) when all demuxers returned EAGAIN. 
Originally committed as revision 17784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 20:24:58 +00:00
Michael Niedermayer
545465ecaa If a demuxer returns EAGAIN, try another demuxer. 
Originally committed as revision 17782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 19:50:04 +00:00
Diego Biurrun
fdf119062e Remove deprecated vhook subsystem. 
Originally committed as revision 17769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 14:09:10 +00:00
Aurelien Jacobs
0a7892468e fix last usage of old metadata API in ffmpeg.c (handling of AVStream language) 
Originally committed as revision 17688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 15:58:57 +00:00
Aurelien Jacobs
a5926d856b convert ffmpeg to new metadata API 
Originally committed as revision 17683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 14:54:22 +00:00
Michael Niedermayer
e6fdc2b1a0 Make sure -vsync 2 does not produce timestamps equal to the previous, 
rather drop a frame.
Fixes Issue872.

Originally committed as revision 17643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 14:53:29 +00:00
Michael Niedermayer
fc6765d719 Update commented fprintf(). 
Originally committed as revision 17642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 14:44:58 +00:00
Michael Niedermayer
3797c74ba5 Add ticks_per_frame, this should hopefully fix the regressions caused 
by the time_base change.

Originally committed as revision 17630 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 23:47:32 +00:00
Michael Niedermayer
34583e1bbe Fix next_pts computation to consider repeat_pict. 
Originally committed as revision 17613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 13:15:22 +00:00
Michael Niedermayer
ad48c9f0b8 Do not duplicate frames if the muxer claims that it is not needed. 
Note to release manager, this is risky and should be reverted if
it causes any problem.

Originally committed as revision 17555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 15:06:17 +00:00
Peter Ross
c027e91a74 Increase ffmpeg intermediate conversion buffer size to accomodate 48-bit RGB rawvideo 
images.

Originally committed as revision 17513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 01:00:28 +00:00
Peter Ross
befb5cac31 Increase ffmpeg intermediate conversion buffer size to accomodate PPM/PNM header. 
Originally committed as revision 17512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 00:58:51 +00:00
Benoit Fouet
49a06a4d25 Change av_log() calls to fprintf() to stderr calls. 
Originally committed as revision 17378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 16:14:34 +00:00
Baptiste Coudurier
d1e3c6fd40 extend resampling API, add S16 internal conversion 
Originally committed as revision 17163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 22:57:10 +00:00
Patrik Kullman
6d0c77ba40 Use av_strlcpy instead of snprintf without formatting. 
Prevents warnings about "format not a string literal and no format arguments".
patch by Patrik Kullman, patrik yes nu

Originally committed as revision 17141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 00:07:32 +00:00
Francesco Cosoleto
ced06bd8fe Add the ability to set the timestamp to the current time by specifying 'now' 
as the time

Patch by Francesco Cosoleto ( cosoleto gmail com )

Originally committed as revision 17076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 22:03:54 +00:00
Stefano Sabatini
8e2fd8e1d4 Replace the calls to the deprecated av_alloc_format_context() with 
corresponding calls to avformat_alloc_context().

Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 08:27:26 +00:00
Robert Swain
1777168269 Make opt_preset() use FFMPEG_DATADIR from config.h rather than /usr and 
/usr/local

Originally committed as revision 16795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 23:10:56 +00:00
Michael Niedermayer
2d4eeaadc4 Workaround ffms behavior of returning EAGAIN at EOF. 
Should fix regression tests & fate.

Originally committed as revision 16727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 09:47:22 +00:00
Michael Niedermayer
ad51c68c01 Handle av_read_frame() EAGAIN return. 
Originally committed as revision 16717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 12:04:01 +00:00
Baptiste Coudurier
6c7c44ee7a exit with error code if av_encode failed 
Originally committed as revision 16704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 21:09:51 +00:00
David Conrad
d43b26ea13 Copy width/height for subtitle streams (needed for scodec copy of mov/mp4 
timed text)

Originally committed as revision 16662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 23:54:27 +00:00
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Michael Niedermayer
528271ff67 Check the return of audio and video encoders. 
Originally committed as revision 16538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 16:15:34 +00:00
Michael Niedermayer
95af5e1c81 All negative returns are errors not just -1. 
Originally committed as revision 16537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 16:11:02 +00:00
Aurelien Jacobs
094d9df72e free all allocated metadata structures 
Originally committed as revision 16457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 22:11:04 +00:00
Michael Niedermayer
25b4c651a3 Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture. 
Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-03 19:17:18 +00:00
Michael Niedermayer
db4fac64db Change AVSubtitle.rects to an array of pointers so ABI does not break 
when the size of AVSubtitleRect changes.

Originally committed as revision 16412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-03 17:54:48 +00:00
Stefano Sabatini
22730e8790 Put pass_logfilename_prefix check on a single line, improve readability. 
Originally committed as revision 16351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 19:28:42 +00:00
Stefano Sabatini
ad16627fa0 Rename variables: 
pass_logfilename -> pass_logfilename_prefix
DEFAULT_PASS_LOGFILENAME -> DEFAULT_PASS_LOGFILENAME_PREFIX

and make clear in the passlogfile OptionDef help string that it takes
a file name prefix rather than a file name.

Originally committed as revision 16350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 19:25:24 +00:00
Wolfram Gloger
50e3477f0f Offer an option (disabled by default) to enable the copy of the frames before 
the first key frame in a stream.
Patch by Wolfram Gloger wmglo /!\ dent med uni (minus) muenchen de

Originally committed as revision 16269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 08:22:22 +00:00
Michael Niedermayer
09a76db8e6 Do not skip frames until the first keyframe when stream copying but 
no starttime is set.
Fixes at least -vcodec copy with VS2k5DebugDemo-01-partial.avi.

Originally committed as revision 16159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:11:36 +00:00
Stefano Sabatini
76bdac6dbf Cosmetics: remove empty comments. 
Originally committed as revision 16124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-14 15:02:27 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Stefano Sabatini
42d1d06e8f Make more informative the error messages regarding the access to the 
2-pass log file.

Originally committed as revision 15970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 08:35:07 +00:00
Benjamin Larsson
13367a46bc channel layout support for ffmpeg.c 
Originally committed as revision 15956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-29 19:32:42 +00:00
Stefano Sabatini
3a25ca18f3 Make rate_emu a global property rather than to be settable for a 
specific input video stream.

See the thread: Fix ffmpeg -re behaviour.

Originally committed as revision 15946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-27 21:38:42 +00:00
Stefano Sabatini
cdd7157bc3 Remove AVInputStream frame variable definition and usage, unnecessary 
after the last commit.

Originally committed as revision 15945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-27 21:30:03 +00:00
Stefano Sabatini
cb103a194b Make the input realtime framerate emulation code use ist->pts for 
computing the time of the next frame to send to output.

See the thread: fix ffmpeg -re behaviour.

Originally committed as revision 15944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-27 21:24:25 +00:00
Stefano Sabatini
e178d7fd0f Make ffmpeg print in the error message the exact line of a preset file 
containing an invalid option or value, and also how the option and the
value have been parsed.

Originally committed as revision 15903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-21 22:56:08 +00:00
Stefano Sabatini
b04665ac02 Make ffmpeg print in the error message the exact line of a preset file 
containing an invalid syntax.

Originally committed as revision 15902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-21 22:51:17 +00:00
Stefano Sabatini
fc5d0db59a Improve error message in case of output file with no streams, dumping 
the empty file format representation and specifying the index number
of the output file.

Originally committed as revision 15870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 23:27:05 +00:00
Stefano Sabatini
bdb9fd9b7f Improve messages printed when there is no input/output file, making 
them more grammatically correct and consistent with other equivalent
messages.

Originally committed as revision 15869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 23:18:44 +00:00
Stefano Sabatini
7a7da6b42f Remove unnecessary calls to show_help(), make ffmpeg/ffplay print a 
specific error message instead.

Originally committed as revision 15868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 23:15:29 +00:00
Luca Barbato
536cd1db71 Flush SDP description 
Originally committed as revision 15826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 12:32:38 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Stefano Sabatini
70899705ee Provide more context to the opt_preset() error messages, printing the 
name of the preset file where the error occurred.

Originally committed as revision 15637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 18:42:20 +00:00
Stefano Sabatini
b73533176b Make ffmpeg abort if a preset file contains an invalid option or 
argument.

Originally committed as revision 15636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 18:27:32 +00:00
Stefano Sabatini
9ac1c884a0 Provide more context for the error message issued when no preset file 
is found.

Originally committed as revision 15635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 18:18:52 +00:00
Ramiro Polla
3ddb448d0a Support absolute DOS paths for preset parameters 
Originally committed as revision 15624 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-15 14:12:59 +00:00
Stefano Sabatini
a57bf69758 Add preset options documentation strings. 
Originally committed as revision 15605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-12 20:46:30 +00:00
Michael Niedermayer
965530e156 Limit discontinuity handling to containers that allow discontinuities. 
Originally committed as revision 15590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-09 18:28:43 +00:00
Aurelien Jacobs
fd2b356a62 cosmetics: indentation 
Originally committed as revision 15588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-08 17:28:49 +00:00
Aurelien Jacobs
6488cf9b09 lookup AVCodec by name 
Originally committed as revision 15587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-08 17:27:45 +00:00
Stefano Sabatini
0093396cff Remove unused and invalid code from ffmpeg.c. 
Originally committed as revision 15567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-05 17:26:09 +00:00
Diego Biurrun
d0feff2a5b Uniformly define _XOPEN_SOURCE to 600. 
The feature_tests.h header from Sun systems (Solaris/OpenSolaris) will abort
the build if _XOPEN_SOURCE is defined to 500, and C99 is requested (as well
as POSIX.1-2001), and will only accept it to be defined to 600.
inspired by a patch from Diego Pettenò, flameeyes gmail com

Originally committed as revision 15460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-29 06:22:12 +00:00
Diego Biurrun
c44c4e181f cosmetics: Consistently use #ifdef in preprocessor directives. 
Originally committed as revision 15459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-29 06:15:51 +00:00
Wolfram Gloger
143df82789 set video_enc->sample_aspect_ratio to fix stream copy 
patch by Wolfram Gloger  wmglo _at_ dent.med.uni-muenchen _dot_ de

Originally committed as revision 15457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 23:24:32 +00:00
Michael Niedermayer
85663ef302 Move opt_default() and set_context_opts() to cmdutils so it can be used from 
the other tools as well.

Originally committed as revision 15450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 19:35:22 +00:00
Stefano Sabatini
d2845b758e Implement the force_fps option, which disables the automatic selection 
of the best framerate amongst the list of supported framerates of the
codec. Use the av_find_nearest_q_idx() function to choose the best
framerate.

See the thread: "Implement in lavc a flag which makes avcodec_open()
to choose the best framerate".

Originally committed as revision 15445 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 17:34:03 +00:00
Michael Niedermayer
4e72f129c3 Support loading presets from random paths. 
Fixes issue659.

Originally committed as revision 15443 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 13:09:29 +00:00
Baptiste Coudurier
fb1d2d7be2 include sys/select.h, fix freebsd 5.5 compilation 
Originally committed as revision 15421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 02:13:38 +00:00
Michael Niedermayer
8a4f816a6d Support comments in preset files. 
Originally committed as revision 15366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-18 21:07:11 +00:00
Gert Vervoort
46cd15ca31 Fix setting default value of scan_offset option for target svcd. 
Patch by Gert Vervoort gert D vervoort A hccnet D nl

Originally committed as revision 15310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-13 17:25:38 +00:00
Baptiste Coudurier
f2abc55945 add -xerror option, ffmpeg will now exit right when an error occurs 
Originally committed as revision 15210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 23:23:44 +00:00
Baptiste Coudurier
6b682df233 print error when deinterlacing fails 
Originally committed as revision 15201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 21:48:46 +00:00
Peter Ross
287ba997b5 Remove further 1sample=2byte assumptions within FFmpeg to allow 
F32LE/F64BE/F64LE audio to be encoded properly.

Originally committed as revision 15192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 10:18:04 +00:00
Peter Ross
f031938343 Display error message when user attempts to resample non-S16 audio formats. 
Patch supplied by Daniel Serpell <daniel dot serpell at gmail dotcom>.

Originally committed as revision 15119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:23:48 +00:00
Stefano Sabatini
de427ff48b Simplify the indexing logic in the av_encode() streams mapping code. 
Originally committed as revision 14992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-27 18:50:46 +00:00
Aurelien Jacobs
c30a4489b4 export sample_aspect_ratio read by the demuxer in a separate field 
that the one read by the decoder.

Originally committed as revision 14932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:13:58 +00:00
Stefano Sabatini
2fc3866d5e Provide a context to opt_frame_rate(), and make it print the wrong 
value in case of error. Improve error reporting and consistency with
the other opt_* functions.

Originally committed as revision 14914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 12:07:48 +00:00
Stefano Sabatini
745b39d5f9 Replace invocations of av_fifo_realloc(), which is going to be 
deprecated, with corresponding invocations of av_fifo_realloc2().

Originally committed as revision 14848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 18:49:57 +00:00
Aurelien Jacobs
7246177d80 ensure we get explicit definition of various _XOPEN_SOURCE functions we use 
Originally committed as revision 14766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-14 22:01:59 +00:00
Loren Merritt
81b060faf9 align the audio decoding buffer, since some codecs write to it with simd 
Originally committed as revision 14707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-12 05:59:12 +00:00
Stefano Sabatini
f44fd37447 Increase the maximum number of supported stream mappings in ffmpeg.c. 
The new value is given by maximum_files_nb * maximum_streams_per_file_nb,
which looks also more correct in respect to the previous value.

Originally committed as revision 14520 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 13:38:31 +00:00
Peter Ross
a79db0f7c4 Add sample format converter to FFmpeg (adds -sample_fmt option) 
Originally committed as revision 14512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 00:37:07 +00:00
Peter Ross
ce1ee094d7 Add opt handler for pending "-sample_fmt" option 
Originally committed as revision 14486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 13:11:07 +00:00
Stefano Sabatini
150d5a259b Make ffmpeg dump output format in case of codec type mismatch between 
an input stream and the corresponding output stream.

Originally committed as revision 14462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-28 21:54:12 +00:00
Peter Ross
aa29709ec8 add CODEC_ID_PCM_F32BE (32-bit floating point PCM big endian decoder) 
Originally committed as revision 14409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 07:08:15 +00:00
Diego Biurrun
e16190fa7a cosmetics: typo fixes 
Originally committed as revision 14376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-24 21:12:37 +00:00
Michael Niedermayer
0042808e31 Remove explicit strict_std_compliance support as it seems to work fine over 
AVOptions, actually it works even finer as it also gets passed to the
decoder.

Originally committed as revision 14307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-19 16:01:46 +00:00
Stefano Sabatini
fc7ad2af05 Make ffmpeg -t X with X<=0 transcode nothing. 
Originally committed as revision 14285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 22:23:29 +00:00
Michael Niedermayer
44eb047a5b Correcting displayed muxing overhead and video stream size. 
Partially fixes issue348.

Originally committed as revision 14282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 13:52:23 +00:00
Michael Niedermayer
8833f375f9 -itsscale to scale timestamps 
fixes issue511

Originally committed as revision 14226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 22:55:52 +00:00
Diego Biurrun
89129c6b1d Drop non-C99-compliant initialization. 
Originally committed as revision 14224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 21:59:58 +00:00
Michael Niedermayer
bd6754aa79 On EOF keep calling the decoders until they do not output anything 
anymore, instead of just once.

Originally committed as revision 14220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 21:39:18 +00:00
Michael Niedermayer
8858816d4c Use -vsync 0 unless the user explicitly asked for something 
else when the framerate is above 1000.
Fixes issue259.

Originally committed as revision 14208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 16:19:23 +00:00
Ramiro Polla
d08e3e91af Prevent users from setting -vol and -acodec copy together. 
They are incompatible since the frames are not decoded, so they can't be preprocessed.

Originally committed as revision 14178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-12 11:43:21 +00:00
Michael Niedermayer
4e999ebe03 indent 
Originally committed as revision 14137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-09 06:57:19 +00:00
Michael Niedermayer
385b19dfd4 Allow setting codecs through preset files 
Originally committed as revision 14136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-09 06:56:26 +00:00
Michael Niedermayer
8dbee6538d Fix the av_set_string() free / alloc issue. 
Originally committed as revision 14134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 23:50:03 +00:00
Michael Niedermayer
b86f5a02ea Register intrrupt_cb() early enough so we dont get stuck with tcp input 
for example.
Fixes issue66

Originally committed as revision 13992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-26 20:50:15 +00:00
Stefano Sabatini
9010d54390 Remove unnecessary function opt_qdiff(), max_qdiff is set now through 
the AVOption system. Also removes the previous constraints when
setting max_qdiff through opt_qdiff() (1 <= max_qdiff <= 31).

Originally committed as revision 13981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 21:48:51 +00:00
Michael Niedermayer
181782ae46 Use correct timestamp value for stream copy. 
Originally committed as revision 13963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 13:46:06 +00:00
Stefano Sabatini
9c09099e75 Cosmetics: move ffmpeg.c dframes option definition from within the 
video options to the generic options where it belongs.

Originally committed as revision 13893 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 16:20:12 +00:00
Baptiste Coudurier
d2ce2f5e5c cosmetics, reindent 
Originally committed as revision 13869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:36:15 +00:00
Baptiste Coudurier
dbedf2aae2 enable feeder threads 
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 01:35:43 +00:00
Stefano Sabatini
88643f396a Cosmetics: display ffmpeg -h generic advanced options just after 
generic non-advanced options.

Originally committed as revision 13794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-17 10:11:46 +00:00
Stefano Sabatini
ef3efa0dbc Don't show advanced subtitle options within the ffmpeg -h generic 
advanced options.

Originally committed as revision 13779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 13:02:22 +00:00
Stefano Sabatini
fb74bc4361 Don't show subtitle and grab options within the ffmpeg -h generic options. 
Originally committed as revision 13778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 10:00:32 +00:00
Stefano Sabatini
d58ddafdbc Make ffmpeg.c use print_error() when it can't read an ffserver stream. 
Originally committed as revision 13761 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 22:30:01 +00:00
Stefano Sabatini
462cca10cf Improve ffmpeg error reporting in case of input/output stream mismatch, 
enabling a dump_format() of the mismatched output stream.

Originally committed as revision 13760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 22:07:17 +00:00
Stefano Sabatini
d18811bbf5 Make ffmpeg.c:opt_thread use parse_number_or_die(). 
Originally committed as revision 13758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:21:28 +00:00
Stefano Sabatini
3022cd10a5 Factorize options context setting. 
Patch by Stefano Sabatini stefano sabatini-lala posteit

Originally committed as revision 13756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 11:28:49 +00:00
Baptiste Coudurier
837d248df6 enable stream copy with ffserver, to be able to chain 
Originally committed as revision 13753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 01:43:52 +00:00
Baptiste Coudurier
6dfafe109d set log debug when avformat debug is set 
Originally committed as revision 13750 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 23:45:00 +00:00
Baptiste Coudurier
3438d82d4b remove ugly ffm_nopts hack, use AVFormatContext->timestamp 
Originally committed as revision 13718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 00:24:29 +00:00
Michael Niedermayer
e66ace6f0b Support longer paths for and longer names in preset files. 
Originally committed as revision 13710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-08 10:52:41 +00:00
Michael Niedermayer
439c18c75d indent 
Originally committed as revision 13709 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-08 10:48:52 +00:00
Michael Niedermayer
23b20b5cf3 Search /usr(/local)/share for preset files as well. 
This also fixed a null pointer dereference if HOME isnt set.

Originally committed as revision 13708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-08 10:48:23 +00:00
Michael Niedermayer
d9f1b68cf5 Presets support. 
How per codec defaults and ranges will be supported is still being discussed.

Originally committed as revision 13685 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 09:12:42 +00:00
Stefano Sabatini
e992fba4ba Add a few newlines to 'ffmpeg -h' output to make it more readable. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-31 18:36:44 +00:00
Peter Ross
418a0b9fc4 Compiling ffmpeg.c fails when when the .ffm demuxer is enabled, but the .ffm 
muxer is disabled. The cause is an incorrect #ifdef that assumes that the
ffm_nopts symbol (global define in ffmenc) is present when either ffm muxer
OR demuxer is enabled.
patch by Peter Ross, pross xvid org

Originally committed as revision 13573 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-31 14:22:30 +00:00
Michael Niedermayer
573e8cb309 Remove incorrect usage of av_free_static(), ffmpeg.c is not a 
windows dll which can be unloaded and loaded again.

Originally committed as revision 13565 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 20:30:29 +00:00
Baptiste Coudurier
9d58e0a9e1 cosmetics, space before and after parenthesis, weird indentation 
Originally committed as revision 13539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 21:26:30 +00:00
Erik Hovland
f094b6627d Remove unnecessary header #includes. 
Extracted from a patch by Erik Hovland, erik hovland org.

Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 13:40:43 +00:00
Stefano Sabatini
ea9c581f61 Simplify show_banner() so that it does not require arguments, similar 
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 08:48:51 +00:00
Stefano Sabatini
e5f6b7e5ac Slightly clarify bitstream filter help output. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 11:55:59 +00:00
Michael Niedermayer
e6b4e4ff5f Remove coded_frame==NULL checks for video encoders. 
Originally committed as revision 13493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 11:34:26 +00:00
Baptiste Coudurier
1234da4caf use av_fifo_generic_write, old func is deprecated 
Originally committed as revision 13455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 01:26:22 +00:00
Michael Niedermayer
bcbd328e17 Make stream copy of ac3 from riff based formats work. 
Originally committed as revision 13408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 00:47:49 +00:00
Michael Niedermayer
fa3b98182d Ensure that one can store X bytes in a fifo of size X. 
Fixed issue417.

Originally committed as revision 13405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 23:04:09 +00:00
Michael Niedermayer
0871ae1a93 Make av_fifo*_read() ignore the available amount of data. 
This is more efficient as in practice the check is redundant most of the
time. Callers which do not know if enough data is available have to check
it with av_fifo_size(). Doing the check in *read() means the caller has
no choice to skip the check when its known to be redundant.
Also the return value was never documented in a public header so
changing it should not break the API. Besides this fixes the case where
read() failed on a 100% full fifo.

Originally committed as revision 13404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 22:20:39 +00:00
Michael Niedermayer
46eab09341 Make opt_verbose() work again. 
Originally committed as revision 13403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 20:34:50 +00:00
Stefano Sabatini
ba9880c13a Move show_formats() to cmdutils.c. 
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 12:55:35 +00:00
Michael Niedermayer
20176cbc73 Get rid of more senseless wrapper functions and use OPT_EXIT instead. 
Originally committed as revision 13233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 23:41:17 +00:00
Michael Niedermayer
64555bd9b1 Do not pass program_name as argument to show_version(), this allows some 
future simplifications.

Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 23:36:32 +00:00
Michael Niedermayer
a0b3bcd9fe OPT_EXIT 
Originally committed as revision 13231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 23:27:50 +00:00
David Bolt
475f4d8d4b Print timestamp with increased precision. 
Patch by David Bolt

Originally committed as revision 13217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 17:44:51 +00:00
Stefano Sabatini
54d2d4f698 Make 'ffmpeg -formats' print codec long names. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 15:36:10 +00:00
Dave Yeo
0a1b29dea7 sys/resource.h needs sys/types.h on OS/2, patch by Dave Yeo, daveryeo telus net 
Originally committed as revision 13116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-11 11:17:23 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Ramiro Polla
b091aa44b7 Check for sys/resource.h and include it conditionally. 
Originally committed as revision 13075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-08 00:44:42 +00:00
Diego Pettenò
580a6c57a3 Mark symbols as static, patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com 
Originally committed as revision 13026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-01 15:12:00 +00:00
Stefano Sabatini
c48da33c63 Send context to some ffmpeg.c opt* function 
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

Originally committed as revision 12927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-22 20:17:30 +00:00
Stefano Sabatini
66824f990b Make some ffmpeg opts use parse-number-or-die. 
Patch by Stefano Sabatini stefano sabatini-lala posteit

Originally committed as revision 12919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-21 08:59:38 +00:00
Ramiro Polla
8767060cd2 Fix bug introduced by r12827. 
If av_exit() was called after an AVFormatContext was created, but before
its file was opened, av_exit() would pass a NULL pointer to url_fclose().

Originally committed as revision 12915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-21 01:22:25 +00:00
Ramiro Polla
296df4e75f Use av_exit() instead of exit() for a minimal cleanup 
before leaving ffmpeg.
Needed by some grab devices and possibly network streams.

Originally committed as revision 12827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-14 22:35:32 +00:00
Ramiro Polla
e5295c0dd9 Move av_exit() so it can be used by more functions 
without needing forward declaration.

Originally committed as revision 12826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-14 22:31:49 +00:00
Stefano Sabatini
6363827e13 Complete argument information in ffmpeg.c:options for non-number arguments 
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

Originally committed as revision 12766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-08 01:01:00 +00:00
Stefano Sabatini
7542157d8a Export parse_time_or_die from ffmpeg.c to cmdutils.c 
Patch by Stefano Sabatini (stefano sabatini-lala poste it)

Originally committed as revision 12647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-31 10:01:06 +00:00
Stefano Sabatini
b19221c8ce Make option time parsing functions take argument from options 
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )

Originally committed as revision 12551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 15:12:04 +00:00
Stefano Sabatini
972d628a8b Provide a context to parse_time_or_die(). 
Patch by Stefano Sabatini: stefano sabatini-lala poste it

Originally committed as revision 12472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 09:33:21 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing 
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:25:09 +00:00
Michael Niedermayer
e60da588e3 sws_flags is unsigned. 
This together with the last commit fixes the strange behavior of -sws_flags.
(issue229)

Originally committed as revision 12325 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 04:02:04 +00:00
Michael Niedermayer
3948c74f80 Remove INFINITY. 
Originally committed as revision 12288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-01 23:36:27 +00:00
Stefano Sabatini
53d1bdbaed Clarify the documentation for 'ffmpeg -v'. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 16:01:53 +00:00
Michael Niedermayer
10e7fc7ce4 Reduce initial fifo size, so as not to senselessly waste memory. 
Originally committed as revision 12186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 01:56:27 +00:00
Michael Niedermayer
a6ebca9e09 realloc fifo 
Originally committed as revision 12185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 01:55:34 +00:00
Stefano Sabatini
b3574faa06 Remove a superfluous call to atoi in ffmpeg.c:opt_verbose 
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )
[FFmpeg-devel] [PATCH] Cosmetics: remove a superfluos call to atoi in
ffmpeg.c:opt_verbose

Originally committed as revision 12136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-18 15:30:56 +00:00
Michael Niedermayer
5bc440e7e8 Add notes where known timestamp issues remain. 
Originally committed as revision 12135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 21:31:39 +00:00
Michael Niedermayer
48291040ea Set initial next_pts to unknown, this avoids the nonsense timestamp 
discontinuity at the start. I hope this has no sideeffects, if it does
send a bugreport!
fixes issue137

Originally committed as revision 12134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 20:12:44 +00:00
Michael Niedermayer
40cb57a287 Print a warning if a decoder produces more than 1 frame of output for 
a single frame it got from the demuxer+parser.

Originally committed as revision 12133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 19:38:47 +00:00
Michael Niedermayer
ed9238593e Set next_pts to pts if it is unknown and pkt->dts is not known either. This 
is needed because next_pts is used to calculate the next pts and adding
to AV_NOPTS_VALUE does not achieve the intended result.

Originally committed as revision 12132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 19:08:15 +00:00
Michael Niedermayer
b1b818fce8 simplify (next_)pts code 
Originally committed as revision 12131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 17:55:53 +00:00
Michael Niedermayer
da0ef2d557 Use next_pts if pkt->dts is unknown. In an ideal world this would not be needed 
but sadly there are cases where the timestamps cannot be found without decoding.

Originally committed as revision 12130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-17 17:41:32 +00:00
Michael Niedermayer
19d5da500f Update ist->pts after decoding a codec frame not after decoding a container 
frame.

Originally committed as revision 12062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-15 21:45:12 +00:00
Michael Niedermayer
880add3743 -vsync 2 (drop frames if there are too many but do not duplicate any) 
Originally committed as revision 11934 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-14 18:53:12 +00:00
Diego Biurrun
c4c52acc36 Remove pointless #if. 
Originally committed as revision 11888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-09 18:07:20 +00:00
Michael Niedermayer
f73008d820 const 
Originally committed as revision 11844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 00:37:36 +00:00
Aurelien Jacobs
815f98cce4 non-const 2nd parameter for strtol/strtod 
Originally committed as revision 11803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-02 00:54:37 +00:00
Baptiste Coudurier
99fb79b55a Do not print quality when stream copy, 
Silence valgrind complaint:
==14746== Conditional jump or move depends on uninitialised value(s)
==14746==    at 0x43488DF: (within /lib/i686/cmov/libc-2.7.so)
==14746==    by 0x434ED81: __printf_fp (in /lib/i686/cmov/libc-2.7.so)
==14746==    by 0x434A3F3: vfprintf (in /lib/i686/cmov/libc-2.7.so)
==14746==    by 0x436EA93: vsnprintf (in /lib/i686/cmov/libc-2.7.so)
==14746==    by 0x4353234: snprintf (in /lib/i686/cmov/libc-2.7.so)
==14746==    by 0x806247C: print_report (ffmpeg.c:963)

Originally committed as revision 11728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 13:08:04 +00:00
Reimar Döffinger
e1cc833926 Add sbsf option for subtitle bitstream filter 
Originally committed as revision 11658 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 21:13:40 +00:00
Evgeniy Stepanov
f8d7c9d373 Add support for Matroska attachments. 
patch by eugeni _dot_ stepanov _at_ gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-27 15:43:17 +00:00
Diego Biurrun
1f8e32cda1 cosmetics: Fix Benoit's ugly formatting. 
Originally committed as revision 11593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-22 08:52:57 +00:00
Benoit Fouet
7055cdacab Inform user when bitstream filter fails. 
Originally committed as revision 11587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-21 13:36:20 +00:00
kweiner@spamcop.net
ab759f6e1e Add "genre" command line option 
Patch by kweiner spamcop net
closes Issue318

Originally committed as revision 11489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-10 10:25:15 +00:00
Andreas Öman
8b389f15cd Correctly use output format stream index for bitstream filter when doing stream copy. 
Originally committed as revision 11480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-09 06:22:32 +00:00
Andreas Öman
8e4270c551 Dont crash if resampling is requested but no audio packets are ever processed. 
Originally committed as revision 11449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 20:42:45 +00:00
Morten Hustveit
ebde2a2cd8 Fix prototype and return value of opt_bitrate and opt_bsf. 
Patch by Morten Hustveit: lists rashbox org

Originally committed as revision 11370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-02 10:24:36 +00:00
Morten Hustveit
464a631c34 Define rc override string as const. 
Patch by Morten Hustveit: lists rashbox org

Originally committed as revision 11369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-02 10:22:36 +00:00
Michael Niedermayer
9de0be61be Do not force fps unless the user actually specified one. 
fixes issue309

Originally committed as revision 11322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-26 22:28:22 +00:00
Michael Niedermayer
b4dba580f9 fix pts and keyframe flags for yuv4mpeg 
fixes issue258

Originally committed as revision 11320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-26 20:38:28 +00:00
Michael Niedermayer
a5baedea01 Prevent silent overwriting of files on windows. 
fixes issue308
untested

Originally committed as revision 11315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-25 10:06:22 +00:00
Diego Biurrun
b7d8f6e095 Fix "suggest parentheses around assignment used as truth value" warnings. 
Originally committed as revision 11293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-21 11:36:04 +00:00
Baptiste Coudurier
a06a18c55d reset manually selected codecs at the end of opt_input_file, to avoid propagating selection to output file 
Originally committed as revision 11289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-21 10:08:43 +00:00
Michael Niedermayer
626004690c Allow overriding codec_ids. 
Originally committed as revision 11266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 10:56:17 +00:00
Andreas Öman
2886f3113e Notify the input coder about the number of requested channels. 
If the decoder does not fulfill our request, try using lavf's audio_resample().
If that also fails, bail out.

Originally committed as revision 11222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-15 07:04:17 +00:00
Måns Rullgård
a309073bf4 use av_log_get/set_level() 
Originally committed as revision 11209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-12 21:48:50 +00:00
Michael Niedermayer
84be6e7239 av_*_next() API for libavformat 
Originally committed as revision 11206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-12 19:01:58 +00:00
Michael Niedermayer
55b9e69a31 av_*_next() API for libavcodec 
Originally committed as revision 11204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-12 18:40:11 +00:00
Panagiotis Issaris
8540e8c3ec Show which bitstreamfilters were compiled in, similar to the protocols etc 
enumerations.

Originally committed as revision 11203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-12 11:52:27 +00:00
Baptiste Coudurier
6b80f1a12d add const to remove warnings, ffmpeg.c:2892: warning: initialization discards qualifiers from pointer target type 
Originally committed as revision 11151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-03 10:03:32 +00:00
Michael Niedermayer
e515221618 Remove rc_eq-specific code, it is passed by AVOption now. 
Originally committed as revision 11143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-03 02:05:31 +00:00
Michael Niedermayer
4b59cf6c1c Fix non-numeric AVOptions. 
Originally committed as revision 11142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-03 01:46:32 +00:00
Michael Niedermayer
90901860c2 stupid code (casting of void*) found by checktree.sh 
Originally committed as revision 11117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-01 00:19:44 +00:00
Michael Niedermayer
1c715415e3 frame_size vs. frame_size*channels bug 
Originally committed as revision 11107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-28 00:59:19 +00:00
Luca Abeni
c721d803cb Introduce libavdevice 
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-22 16:10:02 +00:00
Ramiro Polla
a5e979f42c os_support.h is also needed for usleep and lseek on MinGW. 
Originally committed as revision 11075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-22 02:27:39 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext 
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-21 07:41:00 +00:00
Diego Biurrun
3b8554662b Reorder functions to get rid of ugly forward declarations. 
Originally committed as revision 11034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-15 12:31:58 +00:00
Stefano Sabatini
d4f98ab118 Move up opt_show_license to get rid of ugly forward declaration. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 11019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-14 09:58:38 +00:00
Ramiro Polla
1b1656c67f Warn user if bitrate parameter is too low 
Originally committed as revision 10919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-04 02:03:36 +00:00
Michael Niedermayer
0ac0703107 check av_interleaved_write_frame() return 
fixes issue149

Originally committed as revision 10891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 01:59:22 +00:00
Nico Sabbi
c1a4cdf9bf removed unused variables accidentally introduced in stream_index_from_inputs() 
Originally committed as revision 10870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-28 22:56:41 +00:00
Nico Sabbi
a15bc651f9 reindented after previous commit 
Originally committed as revision 10867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-27 18:50:08 +00:00
Nico Sabbi
50e143c4be added option programid to select the program to use and relative code to handle it 
Originally committed as revision 10866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-27 18:46:25 +00:00
Benoit Fouet
9a3fb64000 Merge audio and video bitstream filter options handling. 
Originally committed as revision 10739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-15 07:20:54 +00:00
Stefano Sabatini
86074ed1b7 Implement common show version and banner. 
Patch by Stefano Sabatini [stefano sabatini-lala poste it]

Originally committed as revision 10600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-27 06:38:40 +00:00
Stefano Sabatini
f94361612a Make parse_date return INT64_MIN in case of unparsable input. 
Patch by Stefano Sabatini: [stefano sabatini-lala poste it]
Original thread:
[FFmpeg-devel] [PATCH] Enhace documentation forlibavformat/utils.c:parse_date
Date: 08/17/2007 09:40 PM

Originally committed as revision 10533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-19 12:38:07 +00:00
Ramiro Polla
f71163d791 Move av_exit() to before main() 
Originally committed as revision 10510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 18:08:51 +00:00
Ramiro Polla
47f93b61e8 Split av_exit() out of main() 
Originally committed as revision 10509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 18:08:01 +00:00
Stefano Sabatini
032aa7df43 Cosmetic, change "fvstats" to "vstats_file". 
Patch by Stefano Sabatini: [stefano sabatini-lala poste it]

Originally committed as revision 10424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-06 20:11:02 +00:00
Marc Hoffman
e146ce521f using isnan instead of d==d, to signal correctly parsed option 
Originally committed as revision 10406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 15:00:00 +00:00
Stefano Sabatini
d16069952e Make ffmpeg use cmdutils.c show_license function 
patch by Stefano Sabatini: [stefano sabatini minus lala ! poste it]

Originally committed as revision 10182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-22 13:04:49 +00:00
Luca Abeni
6d1ba1ac83 Print an SDP when all outputs are RTP (the SDP can be saved in a text file 
and used to receive the streams)

Originally committed as revision 10150 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-20 08:12:08 +00:00
Godwin Stewart
250c531710 update -t option documentation 
Patch by Godwin Stewart

Originally committed as revision 10146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-20 06:50:09 +00:00
Reimar Döffinger
4f48929248 Change imprecise "Unknown codec" message to say "encoder" or "decoder" 
instead of "codec"

Originally committed as revision 10142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-19 11:12:47 +00:00
Stefano Sabatini
60a9966e4d Make cmdutils.c:parse_options accept as argument a function to parse 
bare command line parameters.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-13 23:03:36 +00:00
Stefano Sabatini
74f0780543 Make show-version exit 0. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 13:12:32 +00:00
Stefano Sabatini
5c14a7955e Make show-license exit 0. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 13:11:30 +00:00
Stefano Sabatini
c20bd3e0d8 Make ffmpeg -formats exit 0. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 13:09:35 +00:00
Stefano Sabatini
1af2ca7859 Prefix with "opt_" the functions ffmpeg.c:show_{version,license,formats}. 
patch by Stefano Sabatini [stefano tod sabatini-lala £ poste it]

Originally committed as revision 10049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 07:28:18 +00:00
Michael Niedermayer
de2aeaef02 fix x11grab 
Originally committed as revision 10046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-10 01:15:51 +00:00
Stefano Sabatini
aab1b7e56e Make ffmpeg and ffplay exit 0 after displaying help 
patch by Stefano Sabatini [stefano sabatini minus lala at poste it]

Originally committed as revision 10012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 12:13:29 +00:00
Michael Niedermayer
81d6d520c0 always handle negative timestamp differences as timestamp discontinuity 
Originally committed as revision 9984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-08 18:54:33 +00:00
Nicolas George
4a897224b7 Use the codec name from the command line options instead of the codec id. 
patch by Nicolas George [nicolas dot george normalesup org]
original thread: [FFmpeg-devel] [PATCH] Codec lookup: do not use codec_id
date: 06/18/2007 06:19 PM

Originally committed as revision 9983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-08 14:34:51 +00:00
Benoit Fouet
9895ebe4f5 Avoid showing banner twice. 
Originally committed as revision 9980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-07 14:09:18 +00:00
Ramiro Polla
a9bb28a315 Indent 
Originally committed as revision 9971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-07 00:46:36 +00:00
Michael Niedermayer
a8482aab87 make dts_delta_threshold float so values <1 can be used 
Originally committed as revision 9970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-07 00:26:37 +00:00
Michael Niedermayer
d4d226a8d5 audio drift threshold 
(this switches between resampling style timestamp drift compensation and
hard insert silence / drop samples compensation)

Originally committed as revision 9969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-07 00:03:50 +00:00
Michael Niedermayer
365515ac7f be slightly more careful with copying the codec_tag in the streamcopy case 
fixes streamcopy of Xmen-avc-500.vp6 into flv
closes issue 57

Originally committed as revision 9909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-04 16:03:39 +00:00
Michael Niedermayer
7cacf1e86a drop non keyframes before the first keyframe for stream copy 
Originally committed as revision 9881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-03 23:25:03 +00:00
Michael Niedermayer
4efd6f58b6 fix block_align for mp3 stream copy 
Originally committed as revision 9880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-03 23:23:42 +00:00
Michael Niedermayer
c0dd7b7c94 get rid of some double timebase convertion 
Originally committed as revision 9878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-03 20:49:53 +00:00
Michael Niedermayer
fec401f718 properly implement "user specified start time offset" which was added in r3217 
-ss should now work again
fixes decoding of low.ogg
closes issue47

Originally committed as revision 9876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-03 19:21:50 +00:00
Aurelien Jacobs
11bf3847b3 add proper support for subtitles muxing/stream copying 
Originally committed as revision 9798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-25 19:47:44 +00:00
Aurelien Jacobs
8e0d882b49 copy language information from input stream to output 
Originally committed as revision 9797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-25 19:39:27 +00:00
Aurelien Jacobs
a03d59b720 copy packet duration when doing a stream copy 
Originally committed as revision 9796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-25 19:36:43 +00:00
Diego Biurrun
390d5a7cad cosmetics: indentation 
Originally committed as revision 9758 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 14:48:38 +00:00
Diego Biurrun
d0f596b4ef Make video hook infrastructure conditional on video hooks being enabled. 
Originally committed as revision 9757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 14:48:13 +00:00
Alex Beregszaszi
d24ce947ca indentation fix 
Originally committed as revision 9746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 00:44:47 +00:00
Alex Beregszaszi
6c4d4fa361 removed unused variable ti 
Originally committed as revision 9745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 00:43:35 +00:00
Alex Beregszaszi
43924f018b use av_q2d as in the rest of the file 
Originally committed as revision 9720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-17 13:04:22 +00:00
Ramiro Polla
7495c3066d Check for GetProcessTimes and use it in getutime 
Originally committed as revision 9629 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-13 16:11:36 +00:00
Ramiro Polla
7829950cf2 Collapse getutime into one declaration 
Originally committed as revision 9628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-13 16:05:36 +00:00
Ramiro Polla
66be5b4536 Check for getrusage 
Originally committed as revision 9627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-13 16:04:00 +00:00
Ramiro Polla
4b54c6d084 Check for termios before conio 
Originally committed as revision 9598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-11 14:07:55 +00:00
Ramiro Polla
e16e49ac90 Proper check for interactive support (termios and conio). 
Originally committed as revision 9597 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-11 14:04:54 +00:00
Ramiro Polla
7c37e504f0 Remove OS/2 support 
Originally committed as revision 9586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-10 21:52:04 +00:00
Diego Biurrun
4021300cd5 grammar error noticed by Mark Cox 
Originally committed as revision 9534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 09:20:51 +00:00
Stefano Sabatini
c0de00dac5 me option implemented as an AVOption 
patch by Stefano Sabatini: [stefano sabatini-lala poste it]
original thread:
[FFmpeg-devel] [PATCH] ffmpeg.c -me option implemented as an AVOption
date: 07/05/2007 03:12 PM

Originally committed as revision 9501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 11:47:02 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Ronald S. Bultje
0f4e816582 to be able to compile without HAVE_AV_CONFIG_H 
patch by Ronald S. Bultje: [rsbultje gmail com]
original thread: [FFmpeg-devel] ffmpeg.c/cmdutils.c compilation
date: 06/23/2007 03:15 AM

Originally committed as revision 9453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-02 07:43:23 +00:00
Ronald S. Bultje
9de8e6acf9 remove ENABLE_SWSCALER conditions 
patch by Ronald S. Bultje: [rsbultje gmail com]

Originally committed as revision 9435 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-26 16:13:44 +00:00
Benoit Fouet
29cc1c23d1 Make globals static 
Originally committed as revision 9433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-26 15:52:54 +00:00
Måns Rullgård
f7d78f3654 replace the uses of old string functions that Reimar missed 
Originally committed as revision 9406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-24 11:27:12 +00:00
Stefano Sabatini
b33ece1634 replace calls to deprecated parsing functions to calls to new ones 
patch by Stefano Sabatini: [stefano sabatini-lala poste it]

Originally committed as revision 9359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-18 08:08:43 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Diego Biurrun
364a960704 Move HAVE_AV_CONFIG_H definition to the Makefile like in the rest of FFmpeg. 
Originally committed as revision 9273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-10 14:34:56 +00:00
Stefano Sabatini
c3b95b1d3d Add support for listing the supported pixel formats using the option 
-pix_fmt list
patch by Stefano Sabatini stefano sabatini minus lala chez poste it
original thread: [FFmpeg-devel] [PATCH] List supported pixel formats
date: 05/25/2007 05:46 PM

Originally committed as revision 9162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 14:20:55 +00:00
Aurelien Jacobs
808d83fd33 cosmetics: indentation 
Originally committed as revision 9161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 10:11:05 +00:00
Aurelien Jacobs
8623e55867 use if(ENABLE_SWSCALER) instead of #ifdef CONFIG_SWSCALER 
Originally committed as revision 9160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 10:09:54 +00:00
Ivo van Poorten
3592648940 -sws_flags command line option to set swscaler flags 
Originally committed as revision 9109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-23 18:35:45 +00:00
Luca Abeni
df0cecdde0 Do not try to set a video standard unless "-tvstd" is specified 
Originally committed as revision 9088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-21 09:50:17 +00:00
Nicolas George
3688f93aed make help message go to standard output instead of standard error 
patch by Nicolas George \ nicolas george normalesup org /

Originally committed as revision 8947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-09 08:17:35 +00:00
Stefano Sabatini
b60d13799d add a vstats_file command line option 
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 8810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-25 13:55:11 +00:00
Benoit Fouet
4bd0c2b1d5 Revert my two previous deliveries (back to r8806) to aply the good patch for vstats 
Originally committed as revision 8809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-25 13:48:36 +00:00
Benoit Fouet
f5eb2b653f to complete r8807: free vstats resources 
Originally committed as revision 8808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-25 12:19:56 +00:00
Stefano Sabatini
f801d8aa86 add a vstats_file command line option 
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 8807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-25 09:32:45 +00:00
Michael Niedermayer
859d95baa1 fix overhead and bitrate statistics 
Originally committed as revision 8732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-14 17:50:39 +00:00
Baptiste Coudurier
eddc482dff print error message 
Originally committed as revision 8569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-31 16:04:44 +00:00
Baptiste Coudurier
f9645d7cc4 change -fs to use bytes instead of kbytes 
Originally committed as revision 8556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-30 11:31:29 +00:00
Baptiste Coudurier
85ad1b0e97 change -fs option to use OPT_INT64 
Originally committed as revision 8555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-30 09:44:11 +00:00
Baptiste Coudurier
d1b2356998 1000l, revert r8547, im too stupid 
Originally committed as revision 8548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-29 11:39:09 +00:00
Baptiste Coudurier
ed057fccfc typo, fix -fs 
Originally committed as revision 8547 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-29 11:13:29 +00:00
Bobby Bingham
4992d8bf7d Change the vhook code to send real timestamps to the filters instead of the 
current time of day, which is useless, and which the filters could just as
easily query for themselves.
patch by Bobby Bingham, uhmmmm gmail com

Originally committed as revision 8541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-29 05:24:35 +00:00
Baptiste Coudurier
5508d26b7c fix decoding of big audio packets (48k 16bit 2 channels), needed size is related to samples which is short * while len passed to decode_audio2 is related to pkt->data which is uint8_t * 
Originally committed as revision 8537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-28 11:53:01 +00:00
Michael Niedermayer
c367d06702 prevent exit missuse 
Originally committed as revision 8536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-27 21:47:03 +00:00
Limin Wang
7fc98937d2 add fps stats, patch by Limin Wang <lance lmwang at gmail com> 
Originally committed as revision 8422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-16 16:13:54 +00:00
Ramiro Polla
2a89ee9a63 Remove superfluous HAVE_THREADS #ifdef. 
patch by Ramiro Polla, angustia arrozcru.no-ip org

Originally committed as revision 8348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 17:13:20 +00:00
Diego Biurrun
1420b8375d Remove superfluous header include. 
Originally committed as revision 8341 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 14:42:34 +00:00
Limin Wang
bde0705c8c cosmetics: Fix indentation, patch by Limin Wang, lance.lmwang gmail com. 
Originally committed as revision 8340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 14:35:36 +00:00
Panagiotis Issaris
750f0e1f8b Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log() 
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 14:17:26 +00:00
Baptiste Coudurier
17ceb4f9d1 add message saying that pgmyuv format is deprecated 
Originally committed as revision 8336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 10:24:36 +00:00
Limin Wang
348d46f2cb remove unused code, patch by Limin Wang <lance lmwang at gmail com> 
Originally committed as revision 8304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-09 11:22:18 +00:00
Limin Wang
4e780252f4 Remove unnecessary the_end label. 
patch by Limin Wang, lance.lmwang gmail com

Originally committed as revision 8287 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 10:45:41 +00:00
Michael Niedermayer
54cc9c46e6 set defaults based on CodecType by using avcodec_get_context_defaults2() 
Originally committed as revision 8285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 09:50:05 +00:00
Limin Wang
8e532e681e remove unused variables 
patch by Limin Wang % lance P lmwang A gmail P com %
Original thread:
Subj: [Ffmpeg-devel] [PATCH] remove unused variables
Date: 2007-03-07-07:37 AM

Originally committed as revision 8284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 09:38:08 +00:00
Michael Niedermayer
2d0aefd626 only store command line parameters in contexts with matching codec_type 
Originally committed as revision 8282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 08:34:52 +00:00
Alex Beregszaszi
cbc09a7d5a typo: unkown->unknown 
Originally committed as revision 8274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 00:27:23 +00:00
Michael Niedermayer
cb50328dbb free opt_names at the end of main() based on a patch by Limin Wang 
Originally committed as revision 8268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 21:08:03 +00:00
Michael Niedermayer
4dcc383a4d indention 
Originally committed as revision 8267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 21:02:14 +00:00
Michael Niedermayer
4913b231a7 remove usless if() before av_free() 
Originally committed as revision 8266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 21:01:49 +00:00
Benoit Fouet
066a81a80f change management of "ab" option in ffmpeg.c, so that it works as "b" option. 
patch by Benoit Fouet % benoit P fouet A purplelabs P com %
Original thread:
Subj: [Ffmpeg-devel] [PATCH] use new way to handle "ab" option
Date: 03/03/2007 10:51 PM

Originally committed as revision 8244 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 10:04:53 +00:00
Panagiotis Issaris
636d6a4a47 Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img" 
to "picture" as suggested by Baptiste Coudurier.

Originally committed as revision 8220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-04 11:53:11 +00:00
Baptiste Coudurier
ea0fe83b0f remove ps option and rename rtp_payload_size AVOption to ps 
Originally committed as revision 8172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 16:36:38 +00:00
Benoit Fouet
23b254fb52 duplicate *_opts for every codec types, in order to have the "ab" and "b" options work in the same manner 
patch by Benoit Fouet %benoit P fouet A purplelabs P com%
Orginal thread:
Date: Feb 22, 2007 11:15 AM
Subject: [Ffmpeg-devel] [PATCH] ffmpeg.c duplicate *_opts for every codec types

Originally committed as revision 8169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 14:33:57 +00:00
Luca Abeni
7a16861859 Do not jump to "fail" without having a proper sws context in img_resample_ctx 
(avoid calling sws_freeContext(NULL))

Originally committed as revision 8162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-28 15:07:35 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions 
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 10:27:12 +00:00
Benoit Fouet
036bfd189f Move the aframes option from the video "subsection" to the 
audio "subsection".
Patch by Benoit Fouet, benoit fouet % purplelabs com.

Originally committed as revision 8037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 10:07:56 +00:00
Ramiro Polla
cc58300e30 implement new grabbing interface, as described here: 
ttp://thread.gmane.org/gmane.comp.video.ffmpeg.devel/42920
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
Date: Jan 31, 2007 8:56 PM
Subject: [Ffmpeg-devel] [PATCH] New grabbing interface

Originally committed as revision 7983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-14 17:01:32 +00:00
Måns Rullgård
35f9736988 rename POWERPC_PERFORMANCE_REPORT to CONFIG_POWERPC_PERF 
Originally committed as revision 7968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-13 23:45:28 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs. 
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-13 18:26:14 +00:00
Matthijs Douze
8d74e55b83 Print error message instead of crashing when combining -vcodec copy and -vhook. 
patch by Matthijs Douze, Matthijs.Douze inrialpes fr

Originally committed as revision 7901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-09 17:45:28 +00:00
Diego Biurrun
928e00948a happy new year 
Originally committed as revision 7895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-09 11:15:53 +00:00
Luca Abeni
ab1c6dc95c Directly access av_log_level instead of calling av_log_{set, get}_level() 
(which will be removed at the next avutil version increment)

Originally committed as revision 7882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-08 18:55:36 +00:00
Michel Bardiaux
57b7e784d0 Force stereo in target vcd. 
Patch by Michel Bardiaux, mbardiaux mediaxim be.

Originally committed as revision 7826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-05 16:07:26 +00:00
Michael Niedermayer
5d55e966e1 use avcodec_decode_audio2() 
Originally committed as revision 7792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-01 00:34:09 +00:00
Baptiste Coudurier
e3e3be5346 do not force output audio channels 
Originally committed as revision 7705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-25 09:46:59 +00:00
Baptiste Coudurier
bd31a388db AVOption is now const, removes a few warnings 
Originally committed as revision 7662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-23 13:04:13 +00:00
Baptiste Coudurier
079e8cb962 do not override rc_buffer_occupancy if set 
Originally committed as revision 7641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-22 10:01:14 +00:00
Ramiro Polla
27571d3de9 Segmentation fault fix when no video device is specified. 
patch by Ramiro Polla % ramiro A lisha P ufsc P br %

Originally committed as revision 7445 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-13 16:51:42 +00:00
Guillaume Poirier
f58f4ce19d Original X11 device demuxer patch from Clemens Fruhwirth 
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
  structure for libavformat registration is renamed to
    match build system integration.

Originally committed as revision 7302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-13 08:45:36 +00:00
Guillaume Poirier
83c547a4a1 revert broken commit of x11 device demuxer patch 
Originally committed as revision 7301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-13 00:06:33 +00:00
Guillaume Poirier
e519b02c10 Original X11 device demuxer patch from Clemens Fruhwirth 
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
  structure for libavformat registration is renamed to
  match build system integration.

Originally committed as revision 7293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-12 22:31:46 +00:00
Baptiste Coudurier
386c88de74 print a more correct message when container frame rate differs from codec frame rate 
Originally committed as revision 7264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-09 13:12:02 +00:00
Måns Rullgård
f27a726809 use standard INT64_MAX instead of MAXINT64 (and MIN) 
Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-07 00:47:37 +00:00
Baptiste Coudurier
3c13202396 fix memleak, free stream codec allocated by av_new_stream 
Originally committed as revision 7225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-05 14:01:44 +00:00
Ramiro Polla
d86b83f8ab add interactive support for MinGW 
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Orignial thread:
date: Nov 5, 2006 1:55 AM
subject: [Ffmpeg-devel] [PATCH] MinGW interactive support

Originally committed as revision 7155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-22 12:15:58 +00:00
Michael Niedermayer
f889d3f9e4 also set strict_std_compliance for stream copy, its needed for the bitstream filters 
Originally committed as revision 6959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-10 09:44:38 +00:00
Michael Niedermayer
4408e75e02 2nd try for -vcodec copy timebase selection last one choose 1fps due to broken opendivx stream in avi (avi had the correct 15fps) 
Originally committed as revision 6920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-06 21:54:23 +00:00
Baptiste Coudurier
8a7bde1ca9 move check for output file streams num in av_encode 
Originally committed as revision 6907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-05 20:08:26 +00:00
Baptiste Coudurier
f932cdf209 kill AVImageFormat 
Originally committed as revision 6875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-02 23:22:23 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts. 
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 22:39:58 +00:00
Michael Niedermayer
d29de719a0 better timebase selection heuristic for video stream copy 
fixes -ss -t -vcodec copy

Originally committed as revision 6847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-31 00:39:02 +00:00
borat@subsense.com
39a94d24f7 support for sub-only streams; patch by borat subsense com 
Originally committed as revision 6755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-22 09:12:08 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Diego Biurrun
4bef236ba8 Fix quantiSer --> quantiZer typo. 
Originally committed as revision 6523 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-02 10:23:59 +00:00
Diego Biurrun
3e66a74072 Update copyright year and mention other copyright holders. 
Originally committed as revision 6408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 17:26:15 +00:00
Panagiotis Issaris
720442981b Remove the "mblmax" OptionDef. The equally named AVOption takes over its 
function. A unit change is involved, but as AVOption parameters are now parsed
with ff_eval2(), you can use the QP2LAMBDA constant to ease the change.

Originally committed as revision 6370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:46:25 +00:00
Panagiotis Issaris
93b26b6381 Remove the "mblmin" OptionDef. The equally named AVOption takes over its 
function. A unit change is involved, but as AVOption parameters are now parsed
with ff_eval2(), you can use the QP2LAMBDA constant to ease the change.

Originally committed as revision 6369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:45:51 +00:00
Panagiotis Issaris
0eba70acab Remove the "lmin" OptionDef. The equally named AVOption takes over its function. 
A unit change is involved, but as AVOption parameters are now parsed with
ff_eval2(), you can use the QP2LAMBDA constant to ease the change, f.e.:
ffmpeg -i src.ext -lmin 21*QP2LAMBDA dst.ext

Originally committed as revision 6368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:44:53 +00:00
Panagiotis Issaris
494cf83702 Remove the "lmax" OptionDef. The equally named AVOption takes over its function. 
A unit change is involved, but as AVOption parameters are now parsed with
ff_eval2(), you can use the QP2LAMBDA constant to ease the change:
ffmpeg -i src.ext -lmax 21*QP2LAMBDA dst.ext

Originally committed as revision 6367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-28 17:44:13 +00:00
Panagiotis Issaris
4156a436e3 Handle possible failure of ff_eval. 
Originally committed as revision 6338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-26 14:04:36 +00:00
Panagiotis Issaris
22565f5d7e Remove the "error" OptionDef. The equally named AVOption takes over its 
function.

Originally committed as revision 6322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 15:05:27 +00:00
Panagiotis Issaris
cccb4c966b Remove the "mepc" OptionDef. The equally named AVOption takes over its function. 
Originally committed as revision 6321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 15:04:56 +00:00
Panagiotis Issaris
f4ea01dcd1 Remove the "skip_exp" OptionDef. The equally named AVOption takes over its 
function.

Originally committed as revision 6320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 13:58:38 +00:00
Panagiotis Issaris
f17ec19b5b Remove the "skip_factor" OptionDef. The equally named AVOption takes over its 
function.

Originally committed as revision 6319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 13:57:48 +00:00
Panagiotis Issaris
7c1d662a0c Remove the "skip_threshold" OptionDef. The equally named AVOption takes over its 
function.

Originally committed as revision 6318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 13:56:59 +00:00
Panagiotis Issaris
bf08081389 Remove the "mb_threshold" OptionDef. The equally named AVOption takes over its 
function.

Originally committed as revision 6317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 13:55:56 +00:00
Roman Shaposhnik
f5a478f65d * Moving FifoBuffer out of libavformat/avformat.h and 
libavformat/utils.c into libavutil

Originally committed as revision 6310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-21 07:31:53 +00:00
Panagiotis Issaris
56f68a4112 The "video_rc_buffer_aggressivity" variable is not being used anymore in 
ffmpeg.c.

Originally committed as revision 6302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:51:59 +00:00
Panagiotis Issaris
8cd019bdca Remove the "sc_threshold" OptionDef variable. 
Originally committed as revision 6301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:42:48 +00:00
Panagiotis Issaris
c6dafae954 Remove the "bug" OptionDef used for setting the workaround_bugs variable. 
Originally committed as revision 6300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:42:09 +00:00
Panagiotis Issaris
58bba31e3f Remove the "qsquish" OptionDef. The AVOption min/max value is changed to match 
the removed range check in ffmpeg.c.

Originally committed as revision 6299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:39:56 +00:00
Panagiotis Issaris
6bacd250f4 Remove the "qmax" OptionDef. 
Originally committed as revision 6298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:36:33 +00:00
Panagiotis Issaris
5687a2f4cc Remove the "qmin" OptionDef. 
Originally committed as revision 6297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:34:58 +00:00
Panagiotis Issaris
315b0f9742 Remove the "bf" OptionDef parameter so the equally named AVOption will take 
over. Move over ffmpeg.c constraint checking, but allow value of zero to disable
B-frame.

Originally committed as revision 6296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:34:13 +00:00
Panagiotis Issaris
4ff8fcefd2 Migrate the "packetsize" OptionDef option to become an AVOption. 
Originally committed as revision 6293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:24:17 +00:00
Panagiotis Issaris
09a455764b Migrate the "muxrate" OptionDef option to become an AVOption. 
Originally committed as revision 6292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-20 08:23:01 +00:00
Panagiotis Issaris
81d0618fa4 Remove the "bufsize" OptionDef option from ffmpeg.c. The equally named "bufsize" 
AVOption takes over its function with a change in unit from kilobytes to bits.
Postfix "KiB" is available to ease the discomfort.

Originally committed as revision 6288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-18 19:27:12 +00:00
Panagiotis Issaris
469b7bf868 Remove the "rc_init_cplx" OptionDef option from ffmpeg.c. The equally named 
"rc_init_cplx" AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 23:04:55 +00:00
Panagiotis Issaris
dc5ee8bc54 Remove the "bt" OptionDef option from ffmpeg.c. The equally named 
"bt" AVOption takes over its function although the parameter unit
has changed from kilobits/sec to bits/sec.

Originally committed as revision 6276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 22:32:30 +00:00
Panagiotis Issaris
0dcb89fc52 Remove the "i_qfactor" OptionDef option from ffmpeg.c. The equally named 
"i_qfactor" AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6275 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 21:58:13 +00:00
Panagiotis Issaris
e2a5bc881c Remove the "me_range" OptionDef option from ffmpeg.c. The equally named 
"me_range" AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 19:25:22 +00:00
Panagiotis Issaris
bcce83e693 Remove the "i_qoffset" OptionDef option from ffmpeg.c. The equally named 
"i_qoffset" AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 19:00:46 +00:00
Panagiotis Issaris
a2c00e43c7 Remove the "b_qoffset" OptionDef option from ffmpeg.c. The equally named 
"b_qoffset" AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 18:55:08 +00:00
Panagiotis Issaris
debe5ce152 Remove the "b_qfactor" OptionDef option from ffmpeg.c. The equally named 
"b_qfactor" AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 18:43:42 +00:00
Panagiotis Issaris
3c96abacf0 Fix usage of b_quant_factor. It was not possible to actually use the b_qfactor 
option, as b_quant_factor always got fixed to 2.0 (in any case when it actually
mattered, namely when B-frames were being used).

Originally committed as revision 6268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 18:28:11 +00:00
Panagiotis Issaris
3d720bda76 Remove the "qcomp" OptionDef option from ffmpeg.c. The equally named "qcomp" 
AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:51:46 +00:00
Panagiotis Issaris
99aaf41312 Remove the "qblur" OptionDef option from ffmpeg.c. The equally named "qblur" 
AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:51:00 +00:00
Panagiotis Issaris
908b845785 Remove the "pbias" OptionDef option from ffmpeg.c. The equally named "pbias" 
AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:49:57 +00:00
Panagiotis Issaris
356e7a9d60 Remove the "ibias" OptionDef option from ffmpeg.c. The equally named "ibias" 
AVOption takes over its function and this occurs transparantly.

Originally committed as revision 6264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:49:09 +00:00
Panagiotis Issaris
7c272c0eb0 Remove the "preme" OptionDef option from ffmpeg.c 
Originally committed as revision 6263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:44:36 +00:00
Panagiotis Issaris
babe0e8cef Remove the GOP "g" OptionDef option from ffmpeg.c . 
Originally committed as revision 6262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:40:46 +00:00
Panagiotis Issaris
a551510665 Remove the "maxrate" and "minrate" OptionDef options from ffmpeg.c. This 
requires some modifications to the manpage, as now the unit of -b is bits/sec
not kbits/sec.

Originally committed as revision 6261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 17:38:43 +00:00
Panagiotis Issaris
3c0ba8703c Remove the "b" OptionDef option from the ffmpeg.c file. From now on the unit of 
-b of ffmpeg is bits/sec not kbits/sec, as already was the case for the
AVOption. "k" and "M" suffixes are available though.

Originally committed as revision 6258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 11:15:55 +00:00
Panagiotis Issaris
8e16b25cc1 enables AVOption for muxing. 
Patch by Takis
Original thread:
Date: Sep 8, 2006 10:58 AM
Subject: [Ffmpeg-devel] [PATCH] Enable AVOption for muxers

Originally committed as revision 6197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-08 14:21:57 +00:00
Panagiotis Issaris
63d5075c5c adds support for setting that album tag. 
Patch by takis P issaris A uhasselt P be
Original thread:
[PATCH] Allow setting album tag
Date: Sept 06 2006 16:39

Originally committed as revision 6187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-07 08:27:05 +00:00
Michael Niedermayer
2c00106c2b ignore index parameter to ignore the ODML index in avi 
Originally committed as revision 6177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-05 19:23:32 +00:00
Michel Bardiaux
5c07cf535f Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be % 
Original thread:
Date: Aug 30, 2006 4:54 PM
Subject: [Ffmpeg-devel] [PATCH] Clarified API for numbered sequences

Originally committed as revision 6166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-04 09:57:47 +00:00
Panagiotis Issaris
e8a42081d2 Fix linking when the FFM muxer/demuxer is disabled. 
patch by Panagiotis Issaris, takis.issaris _at_ uhasselt -dot- be

Originally committed as revision 6136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-31 01:22:03 +00:00
Nico Sabbi
4eb72c6b23 initial support for AVOption in AVFormatContext 
Originally committed as revision 6108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-27 12:14:13 +00:00
Luca Abeni
0b50ac8a0f Avoid segfaulting if the swscale context cannot be allocated 
Originally committed as revision 5936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-05 13:09:42 +00:00
Luca Abeni
e7268d51af Fix "-aspect" when "-pad*" is used 
Originally committed as revision 5935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-05 12:54:16 +00:00
Luca Abeni
18a54b040d Move ffmpeg.c to the swscale interface 
Originally committed as revision 5891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-02 11:50:38 +00:00
Víctor Paesa
5894e1bbf2 add loop_input to AVFormatContext, getting rid of old hack 
patch by Víctor Paesa <wzrlpy at arsystel com>

Originally committed as revision 5729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-13 21:13:49 +00:00
Diego Biurrun
2f30a81d19 CONFIG_WIN32 implies MinGW and Cygwin and possibly more, so use just 
CONFIG_MINGW or __MINGW32__ instead.

Originally committed as revision 5718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-11 21:45:45 +00:00
Michael Niedermayer
748c2fca7e AVBitStreamFilter (some thingy which can modify the bitstream like add or remove global headers or change the headers or ...) 
Originally committed as revision 5643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-06 15:04:46 +00:00
Michael Niedermayer
9e0db7d5aa simplify 
Originally committed as revision 5513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-24 09:57:28 +00:00
Justin Ruggles
cef7cc7232 CODEC_CAP_SMALL_LAST_FRAME patch by Justin Ruggles jruggle earthlink net 
Originally committed as revision 5512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-24 09:25:21 +00:00
Diego Biurrun
f1cc88a5d6 Use Subversion revision for FFMPEG_VERSION. 
based on a patch by Ismail Dönmez ismail$$at$$pardus$$dot$$org$$dot$$tr

Originally committed as revision 5502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-20 10:24:08 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used 
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-18 11:33:14 +00:00
Loren Merritt
4e64beadf0 Snow 1pass ratecontrol 
Originally committed as revision 5416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-28 12:38:10 +00:00
Luca Abeni
b997b34fa7 Fix cropping & padding when capturing from a v4l(2) card 
Originally committed as revision 5385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-16 13:43:06 +00:00
Luca Abeni
c3f11d199c Simplify the code used for assigning video_resample, video_crop, & video_pad 
Originally committed as revision 5306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-20 12:57:19 +00:00
Luca Abeni
f122deb45c Cosmetic patch: fix indentation (broken by previous cropping / padding 
patch)

Originally committed as revision 5280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-10 10:16:13 +00:00
Luca Abeni
07d0cdfc9f Make cropping, padding, and rescaling independent (after this patch, 
the cropping / padding code in img_resample() is not needed anymore)

Originally committed as revision 5279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-10 09:04:15 +00:00
Luca Abeni
5341c20954 Baptiste COUDURIER's padding patch (reworked by me a little bit). 
Moves padding code to imgconvert.c, and enables padding colorspaces != YUV420P.

Originally committed as revision 5278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-10 07:45:29 +00:00
Roman Shaposhnik
06ab9cffb2 * fixing -target *dv issues with not setting pix_fmt and adding dv50 target 
Originally committed as revision 5244 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-30 02:36:02 +00:00
Luca Abeni
c17be81763 Change img_convert() from img_fmt to img_fmt with img_copy() 
Originally committed as revision 5236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-29 08:25:09 +00:00
Harikrishnan Varma
023857be70 make the delta magnitude a user specifyable parameter: 
-dts_delta_threshold.
patch by Harikrishnan Varma < hvarma AH divxcorp POIS com >
Original thread:
Date: Mar 14, 2006 1:13 AM
Subject: [Ffmpeg-devel] Audio-video sync problem when transcoding to
xvid in AVI

Originally committed as revision 5166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-15 07:16:16 +00:00
Baptiste Coudurier
f2651e7a6c Fix cropping, depending on enc pix fmt 
Originally committed as revision 5134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-10 13:55:48 +00:00
Luca Abeni
4c4a4e9afe Fix crop & pad + rescaling 
Originally committed as revision 5133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-09 15:27:22 +00:00
Luca Abeni
6714e97c30 Rename the "-loop" option defined in ffmpeg.c to "-loop_input" ("-loop" 
conflicts with an AVOption)

Originally committed as revision 5077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-28 11:32:31 +00:00
Baptiste Coudurier
9df3437fe1 This patch makes output codec keeping input pix_fmt value when using 
stream_copy
patch by (Baptiste COUDURIER <baptiste@coudurier.smartjog@com>)

Originally committed as revision 5017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-13 15:36:13 +00:00
Luca Abeni
0a7b514f13 video4linux2 input support 
patch by Luca Abeni, lucabe72 $$at$$ email $$dot$$ it

Originally committed as revision 4916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-01 11:31:33 +00:00
Dieter
ceaf1909c1 add static keyword to some functions 
patch by Dieter <freebsd at sopwith solgatos com>

Originally committed as revision 4913 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-30 23:33:19 +00:00
Alexander Strasser
45dd4350ac Print libavutil version too. 
Originally committed as revision 4906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-28 16:23:04 +00:00
Luca Abeni
dea42fdf8d ffmpeg forgets to set AVFormatParameters::pix_fmt when capturing from a 
v4l card.
In other words, if you type ffmpeg -pix_fmt yuv422 -s 352x288 test.avi
the "-pix_fmt yuv422" option will have no effect.

Patch by Luca Abeni *** lucabe72 !a! email ! it ***

Originally committed as revision 4899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-26 19:38:16 +00:00
Diego Biurrun
f038fe8b4a warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it 
Originally committed as revision 4898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-25 22:10:13 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Alex Beregszaszi
cc59080c01 better version reporting 
Originally committed as revision 4822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-07 20:21:36 +00:00
Robert Swain
58f7833e8e update x264 wrapper. 
patch by Robert Swain.

Originally committed as revision 4784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-29 07:24:23 +00:00
Michael Niedermayer
51d6a3cf00 iterative overlapped block based motion estimation for snow 
Originally committed as revision 4781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-28 15:43:53 +00:00
Michael Niedermayer
c9ab8df88a 10l (didnt remove option from old ones after converting to AVOption) 
Originally committed as revision 4775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-25 17:43:52 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Michael Niedermayer
0888fd220c support printing compact qp histogram 
Originally committed as revision 4755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-18 20:01:02 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00
Alex Beregszaszi
f37f8d4c55 fix ffserver, it is working for me now again, a more elegant fix is needed though 
Originally committed as revision 4637 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-10-12 23:38:39 +00:00
Michael Niedermayer
8f196b14f5 changing a few options to AVOptions 
Originally committed as revision 4603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-20 21:43:45 +00:00
Michael Niedermayer
6fd46414db dont include opt.h in avcodec.h 
Originally committed as revision 4591 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-12 18:24:48 +00:00
Diego Biurrun
1471c6c2e8 CAREFULL --> CAREFUL typo fix 
Originally committed as revision 4590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-12 16:30:47 +00:00
Michael Niedermayer
ec9127c4a4 converting a few more options to AVOptions 
Originally committed as revision 4587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-12 12:07:08 +00:00
Michael Niedermayer
637b5326f3 convert some options in ffmpeg.c to AVOptions 
Originally committed as revision 4586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-12 10:23:52 +00:00
Michael Niedermayer
a1689e2f19 avoid stdio.h 
Originally committed as revision 4585 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-11 23:19:57 +00:00
Michael Niedermayer
8bbf6db98b AVOption API improvments 
support AVOptions for encoding in ffmpeg.c

Originally committed as revision 4580 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-11 11:10:25 +00:00
Michael Niedermayer
e7902f2095 do not rescale AV_NOPTS_VALUE 
Originally committed as revision 4577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-11 08:24:36 +00:00
Michael Niedermayer
78e035162c the user sets codec->time_base for video encding so she should also set it for audio encoding 
Originally committed as revision 4555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-04 09:00:47 +00:00
Reimar Döffinger
b461b3bc4a Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit). 
Originally committed as revision 4548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-02 19:16:48 +00:00
Justin Ruggles
c57c770db3 vbr audio encode patch by (Justin Ruggles: jruggle, earthlink net) 
with changes by me
    int->float as video uses float too
    remove silent cliping to some per codec range, this should result in an error instead
    remove change to utils.c as its inconsistant with video

Originally committed as revision 4533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-21 20:27:00 +00:00
Michael Niedermayer
30bc6613fe support fixing missing pts by parsing future frames 
Originally committed as revision 4526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-15 14:22:43 +00:00
Mike Brown
ae38261ee8 changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com) 
Originally committed as revision 4501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-10 23:41:20 +00:00
Luca Abeni
f2d9a9f5b7 let user set codec even if CODEC_ID_NONE is default patch by (Luca Abeni: lucabe72, email it) 
Originally committed as revision 4466 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-22 22:24:41 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 22:24:36 +00:00
Michael Niedermayer
c6ec28b18c DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk) 
Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 00:28:12 +00:00
Michael Niedermayer
b7b84107b5 error_resilience = FF_ER_CAREFULL 
Originally committed as revision 4433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-11 22:15:58 +00:00
Michael Niedermayer
90ad92b39d support changing in bitstream global headers into extradata style and back 
Originally committed as revision 4395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-27 00:04:03 +00:00
Michael Niedermayer
6beefa4085 *BSD bktr grab support by (Jacob Meuser: jakemsr, jakemsr com) 
Originally committed as revision 4392 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-25 09:04:08 +00:00
Todd Kirby
8108551a5c Animated GIF looping patch by (Todd Kirby // ffmpeg.php gmail com) 
Originally committed as revision 4383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-18 01:52:24 +00:00
Michael Niedermayer
1ab1f099eb set log level to AV_LOG_DEBUG if -debug ... is used 
Originally committed as revision 4359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-07 21:53:56 +00:00
Fabrice Bellard
cf7fc795ae support for adding new components (syntax: ffmpeg -i input_file [output options] output_file [[component output options] {-newaudio|-newvideo|-newsubtitle}]... - added subtitle support - added '-alang' option 
Originally committed as revision 4351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-03 14:31:45 +00:00
Måns Rullgård
ef7b5aee5d add -gray command line flag 
Originally committed as revision 4328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-31 11:49:55 +00:00
Wolfram Gloger
b4a3389e70 sync output stream against any input stream (extension of map) patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de) 
Originally committed as revision 4308 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-26 08:59:05 +00:00
Michael Niedermayer
68fc9c272b b frame strategy 
set emu edge if lowres

Originally committed as revision 4299 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-21 22:03:24 +00:00
Michael Niedermayer
87017bada0 10l (rescaling AV_NOPTS_VALUE) 
Originally committed as revision 4227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-12 16:28:24 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Michael Niedermayer
644a92626a PIX_FMT_NONE and related fixes 
Originally committed as revision 4161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-25 18:29:06 +00:00
Michael Niedermayer
09c3e44e8a motion estimation bitrate penalty compensation 
Originally committed as revision 4092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-27 12:19:59 +00:00
Michael Niedermayer
dffbfd06e4 copy extradata for streamcopy 
Originally committed as revision 4077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-24 01:47:45 +00:00
Calcium
b691166c0f 25_fix_problem_that_unsynced_with_ss_option.patch by (Calcium | calcium nurs or jp) 
Originally committed as revision 4076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-23 21:07:11 +00:00
Calcium
c64d476ccd 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp) 
Originally committed as revision 4072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-23 12:52:24 +00:00
Michael Niedermayer
59fa3f96f4 support omiting various headers in mpeg4 as WMP seems to have difficulty with them 
based upon 27_WMP_compatibility_with_ISOMPEG4.patch by (Calcium | calcium nurs or jp)
  indention fixed
  uses workaround_bugs instead of strict_std_compliancy as WMP is not the reference implementation

Originally committed as revision 4069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-23 11:39:38 +00:00
Michael Niedermayer
a9aa346717 change audio volume range so that the very slow division by 100 can be avoided 
alternatively we could also use a nicer default = 100 or 1.0 scale and internally change it (patch welcome)

Originally committed as revision 4066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-23 02:10:23 +00:00
Calcium
7e987c33ff 19_audio_volume_adj.patch by (Calcium | calcium nurs or jp) 
Originally committed as revision 4065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-23 01:59:17 +00:00
Calcium
ca80810bd9 12_finish_encoding_at_shortest_stream_was_finished.patch by (Calcium | calcium nurs or jp) 
Originally committed as revision 4064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-23 00:52:31 +00:00
Calcium
b6e16b8653 08_limit_in_filesize.patch by (Calcium | calcium nurs or jp) 
Originally committed as revision 4061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-22 18:20:07 +00:00
Michael Niedermayer
ff8cc24bf5 init has_b_frames for stream copy 
Originally committed as revision 4060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-22 18:15:55 +00:00
Måns Rullgård
eb8393a8c7 argument name for -vdt 
Originally committed as revision 4052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-17 05:07:54 +00:00
Michael Niedermayer
f3356e9c9e more fine grained discarding of packets 
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-17 01:25:01 +00:00
Michael Niedermayer
094147cd9c set global_quality 
Originally committed as revision 4037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-14 23:14:17 +00:00
Calcium
da723fd2dd This patch corrects the bug, that if padbottom IS NOT specified and 
padright IS specified
patch by (Calcium <calcium nurs.or jp>)

Originally committed as revision 3987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-27 01:46:24 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>) 
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-24 19:08:50 +00:00
Michel Bardiaux
3d38fd1cd4 better error message patch by (Michel Bardiaux <mbardiaux peaktime be>) 
Originally committed as revision 3961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-16 23:56:51 +00:00
Michael Niedermayer
09b0499f1b seperate bitstream encoding skip from PASS1 flag 
Originally committed as revision 3938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-06 10:36:07 +00:00
Michael Niedermayer
6e0d8c06c7 mb_lmin/max to limit the per mb quality for the ratecontrol independant from the frame limits 
Originally committed as revision 3928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 19:33:48 +00:00
Michael Niedermayer
a603bf8d68 dont predict missing timestamps if we lack the required information to do so 
Originally committed as revision 3898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-29 02:27:33 +00:00
Michael Niedermayer
b4aea108eb support discarding of uninterresting packets 
Originally committed as revision 3858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-22 01:48:11 +00:00
Roine Gustafsson
ac930a999c console text to stderr : rev2 patch by (Roine Gustafsson <roine users.sourceforge net>) 
Originally committed as revision 3854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-21 21:32:37 +00:00
Martin Drab
6a5d4395ed Exporting some more options patch by (Martin Drab <drab kepler.fjfi.cvut cz>) 
Originally committed as revision 3847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-19 12:41:37 +00:00
Michael Niedermayer
fdb86eb10d trying to fix the -ss bugs 
Originally committed as revision 3843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-17 03:15:57 +00:00
Michael Niedermayer
83b074704b never freed buffer fix 
based upon a patch by (Kurosu <kurosu inforezo org>)

Originally committed as revision 3829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 18:12:13 +00:00
Michael Niedermayer
2fc8ea249f dissallow sprintf 
Originally committed as revision 3823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:59:42 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks 
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:16:25 +00:00
Michael Niedermayer
4bbc62606d 10l (ret vs. ret>0) 
Originally committed as revision 3818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-10 20:29:39 +00:00
Michael Niedermayer
55cf195952 .{Y,U,V} image2 support 
Originally committed as revision 3802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-04 13:27:35 +00:00
Panagiotis Issaris
f50f817566 target VCD GOP size patch by (Panagiotis Issaris <takis >< lumumba dot luc.ac.be>) 
Originally committed as revision 3781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 23:04:26 +00:00
Panagiotis Issaris
ff52bc3e31 target DV patch by (Panagiotis Issaris <takis at lumumba..luc..ac..be>) 
Originally committed as revision 3779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 18:50:47 +00:00
Michael Niedermayer
c13449112b stream copy block_align 
Originally committed as revision 3766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-20 12:55:40 +00:00
Panagiotis Issaris
ed2d7a341e When using the -target option, although PAL or NTSC is specified, 
the framerate is not set according to the standard
add NTSC-Film framerates.
patch by (Panagiotis Issaris <takis O lumumba o luc o ac o be>)

Originally committed as revision 3763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-19 15:31:55 +00:00
Michael Niedermayer
15bc38e57c try to guess the fps if they are variable 
Originally committed as revision 3760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-19 01:23:22 +00:00
Michael Niedermayer
2fef0bdfc1 try to set next_pts to a reasonable value in case of streamcopy 
Originally committed as revision 3753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-14 20:01:49 +00:00
Michael Niedermayer
0fd6aea1f1 more flexible frame skip decission 
Originally committed as revision 3743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 18:02:56 +00:00
Michael Niedermayer
bbf18b21b7 frame skip support 
Originally committed as revision 3742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 11:46:16 +00:00
Michael Niedermayer
7ca60994f7 max frames command line options 
Originally committed as revision 3722 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-30 16:03:29 +00:00
Michael Niedermayer
8a6cb11455 10l (encode bit buffer too small for 1920x1080 raw) 
Originally committed as revision 3716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-27 17:46:30 +00:00
François Revol
2450cff2c3 BeOS threading support. changed some "if FOO_THREAD||BAR_THREAD" to a more generic "if HAVE_THREADS" 
Originally committed as revision 3702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-21 18:04:56 +00:00
Michael Niedermayer
cbb6e405c0 parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>) 
Originally committed as revision 3700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-21 03:37:33 +00:00
Michael Niedermayer
9286699a67 disable redundant image formats, otherwise we wont get any bugreports about -f image2 
Originally committed as revision 3683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-14 22:30:44 +00:00
Michael Niedermayer
5b6d559680 move p*m from image/lavf -> image2/lavc 
video/audio_codec_id in AVFormatParameters to override/help demuxer
av_guess_codec() to guess the default codecs based upon muxer + filename

Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-11 18:09:28 +00:00
Michael Niedermayer
70122f2902 remove weird offsets 
Originally committed as revision 3660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-04 19:02:14 +00:00
Michael Niedermayer
b551204a96 stdin detection fix 
Originally committed as revision 3633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-24 22:32:40 +00:00
Roman Shaposhnik
2639c651db * Introducing new UI for grabbing. 
There's an option -grab <format> that basically acts as -i
      but for grabbing. So now it's possible to grab from multiple
      sources at once and fully control -r -s and -pix_fmt for
      each individual grab.

    * removing -dv1394
      Please use -grab dv1394 instead.

Originally committed as revision 3613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-20 04:57:09 +00:00
Michael Niedermayer
92a80570aa add the long_name to the -formats output patch by (john Galloway <jrg at monsterbot dot com>) and (Måns Rullgård <mru at mru dot ath dot cx>) 
Originally committed as revision 3611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-19 10:52:59 +00:00
Wolfram Gloger
daed32f7d0 update sync_opts for video frame copy patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>) 
Originally committed as revision 3605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-17 23:57:28 +00:00
Michael Niedermayer
17c88cb0ce user setable preload and max_mux_delay 
Originally committed as revision 3602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-16 21:27:42 +00:00
Michael Niedermayer
b2a2197e71 user setable fourcc 
Originally committed as revision 3597 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-16 01:51:50 +00:00
Michael Niedermayer
035817727f support strictly enforcing gop size 
Originally committed as revision 3594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-15 02:37:04 +00:00
Michel Bardiaux
f255e0abfc config options log patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 3582 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-11 19:50:50 +00:00
Michael Niedermayer
3ba1438dec use native timebase for seeking 
direction flag for seeking

Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-10 22:05:43 +00:00
Michel Bardiaux
791d8d1d67 Doc improvement for -target patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 3569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-07 03:20:27 +00:00
Michael Niedermayer
6c55b27f8f do not randomize unknown timestamps 
Originally committed as revision 3568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-07 01:55:34 +00:00
Michael Niedermayer
2db3c638a7 user selectable packet_size and mux_rate 
Originally committed as revision 3566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-06 22:29:30 +00:00
Paul Curtis
78a0efb4fc AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>) 
Originally committed as revision 3557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 18:21:45 +00:00
Michael Niedermayer
f20ad5534a fix initial vbv buffer underflow 
Originally committed as revision 3556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-03 13:21:52 +00:00
Nathan Kurz
c19e76ceb7 ffmpeg not selecting first available stream, patch by (Nathan Kurz <nate at verse dot com>) 
Originally committed as revision 3538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-29 15:53:37 +00:00
Michael Niedermayer
78953e626f avoid using local arrays outside the block where they live ... 
Originally committed as revision 3536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-28 21:50:40 +00:00
Michael Niedermayer
58978c070a less printf spam 
Originally committed as revision 3533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-28 19:14:47 +00:00
Michael Niedermayer
32019cddb4 fix assert 
Originally committed as revision 3532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-28 14:52:24 +00:00
Michael Niedermayer
8cbd529f12 10l (wrong context) 
Originally committed as revision 3508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-25 23:54:38 +00:00
Michael Niedermayer
178fcca848 1/2 resolution decoding 
Originally committed as revision 3507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-25 23:18:58 +00:00
Michael Niedermayer
a42c7b07ae removing useless code 
Originally committed as revision 3493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-22 18:50:15 +00:00
Michael Niedermayer
2b18dcd06d last timestamp and -vsync 0 fix 
Originally committed as revision 3492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-22 17:50:53 +00:00
Michael Niedermayer
bd1b79a145 initial timestamp fix 
Originally committed as revision 3485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-20 15:49:24 +00:00
Michael Niedermayer
bf0669aa87 forgotten parameter 
Originally committed as revision 3428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-02 13:28:37 +00:00
Michael Niedermayer
df84ac2e7d stack overflow 
Originally committed as revision 3389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-14 14:51:10 +00:00
Michael Niedermayer
baced9f598 user overrideable level & profile 
Originally committed as revision 3385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-13 13:59:28 +00:00
Michael Niedermayer
9b7bf3c866 spelling fixes, closes bug #1005426 
Originally committed as revision 3383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-13 00:50:56 +00:00
Michael Niedermayer
65bf3c53a7 typo fix by ("Todd.Kirby" <doubleshot at pacbell dot net>) 
Originally committed as revision 3344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-26 16:32:15 +00:00
Michael Niedermayer
8300609b78 multi frame duplication fix 
Originally committed as revision 3338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-25 09:30:56 +00:00
Patrice Bensoussan
a9aeda81e7 Fix bug causing conversion to stop when output_packet() fails patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>) 
Originally committed as revision 3337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-25 00:22:20 +00:00
Patrice Bensoussan
0a38bafdcd Option to copy meta data from specified file patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>) 
Originally committed as revision 3331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-21 01:35:32 +00:00
Michael Niedermayer
eb5ec8fe6c segfault fix 
Originally committed as revision 3322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-16 00:00:52 +00:00
Michael Niedermayer
28f88dc826 in/outfile options 
Originally committed as revision 3311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-14 02:39:55 +00:00
Michael Niedermayer
23c9925329 libdts support by (Benjamin Zores <ben at geexbox dot org>) 
Originally committed as revision 3310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-14 01:32:14 +00:00
Michael Niedermayer
eb507b21c4 comment is no longer true 
Originally committed as revision 3309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-14 00:27:55 +00:00
Michael Niedermayer
1ac3176044 ugly missing lrintf workaround by ("Steven M. Schultz" <sms at 2bsd dot com>) 
Originally committed as revision 3289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-05 19:19:04 +00:00
Michael Niedermayer
c43042a7d4 100l fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>) 
Originally committed as revision 3286 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-02 20:20:57 +00:00
Michael Niedermayer
f41dd5aad5 100l(audio sync) fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>) 
Originally committed as revision 3283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-02 13:25:04 +00:00
Mike Melanson
da1da89044 use a more portable version macro 
Originally committed as revision 3281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-01 03:34:49 +00:00
Michael Niedermayer
ff4905a524 better audio drift compensation 
Originally committed as revision 3275 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 17:53:05 +00:00
Michael Niedermayer
641aa661f6 10l 
Originally committed as revision 3273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 15:09:21 +00:00
Michael Niedermayer
986ebcdb1b audio timestamp drift compensation 
Originally committed as revision 3272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 14:47:29 +00:00
Michael Niedermayer
ff90688844 10l 
Originally committed as revision 3268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 10:33:37 +00:00
Mike Melanson
13100292d3 add some expanded information when printing the banner, and always print 
the banner; this will hopefully help in bug reporting

Originally committed as revision 3267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 00:29:52 +00:00
Michael Niedermayer
23ffe323d0 -t + capture bugfix 
Originally committed as revision 3266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-29 22:56:54 +00:00
Michael Niedermayer
27537106ac try to allocate the buffer before usig it :) 
Originally committed as revision 3245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-22 21:45:30 +00:00
Michael Niedermayer
6f82497728 flush audio encoder buffers at the end 
fix vorbis in nut again

Originally committed as revision 3244 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-22 21:14:01 +00:00
Wolfram Gloger
cfcbbe48b6 Correct audio parameters when grabbing and using "-acodec copy" patch by (Wolfram Gloger <wmglo at dent ot med dot uni-muenchen dot de>) 
Originally committed as revision 3235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-18 16:32:45 +00:00
Luca Abeni
6e454c38b0 A/V Synch in ffmpeg patch by (Luca Abeni <lucabe72 at email dot it>) 
Originally committed as revision 3233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-18 03:03:32 +00:00
Michael Niedermayer
50c3dd32fd pass timestamps correctly for -sync 0 
use zero sized frames in avi to handle duplicate frames

Originally committed as revision 3225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-15 13:49:12 +00:00
Michael Niedermayer
72bd81008e timestamp discontinuity correction try #1 
Originally committed as revision 3218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-12 03:41:36 +00:00
Wolfram Gloger
a6a92a9aa6 user specified start time offset 
frame dup/drop info
typos
patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)

Originally committed as revision 3217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-11 22:03:16 +00:00
Michael Niedermayer
1a11cbcc49 -cbp 
change -dc range from 0-3 to 8-11

Originally committed as revision 3193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-05 21:08:45 +00:00
Michael Niedermayer
f7e1e69e18 -qprd 
Originally committed as revision 3187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-02 18:51:43 +00:00
Michael Niedermayer
2a8edc5d92 10l (-top 0) 
Originally committed as revision 3186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-02 17:17:44 +00:00
Michael Niedermayer
3c895fc098 correctly interleave packets during encoding 
dts/pts fixed for streamcopy
dont use coded_frame->key_frame hack in muxers, use AVPacket.flags instead

Originally committed as revision 3171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 18:50:31 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame() 
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 02:06:32 +00:00
Michael Niedermayer
9debb40040 100l 
Originally committed as revision 3151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-23 14:35:55 +00:00
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream 
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 20:43:21 +00:00
Michael Niedermayer
c7baf14bd4 muxing overhead statistic fix for stream copying 
Originally committed as revision 3143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-20 16:05:47 +00:00
Michael Niedermayer
22f7a0601e automatic framerate selection 
Originally committed as revision 3132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-12 16:51:39 +00:00
Michael Niedermayer
fcee016467 automatic pixel format selection 
Originally committed as revision 3131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-12 16:00:44 +00:00
Michael Niedermayer
dd17409ca0 next_pts fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>) 
note, dont take the PSNR/stddev values serious, they are caused by a bug in ffmpeg.c which drops one frame before the last frame during encoding with b frames

Originally committed as revision 3110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-05 21:23:28 +00:00
Michael Niedermayer
8a0c66a7e3 coder, context, predictor command line options 
Originally committed as revision 3109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-05 21:19:08 +00:00
Michael Niedermayer
bf266e195a intra_dc_precission>0 encoding support 
Originally committed as revision 3093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 13:44:29 +00:00
Michael Niedermayer
242f5b0a88 ffmpeg -version 
Originally committed as revision 3091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 12:30:51 +00:00
Wolfram Gloger
4b85a28f27 Fix synthetic next_pts calculation / audio pts patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>) 
Originally committed as revision 3079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-26 23:06:29 +00:00
Michael Niedermayer
4ea4b27469 lmin/lmax 
Originally committed as revision 3070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-25 19:43:01 +00:00
Michael Niedermayer
f20f8a8b0b support reusing mb types and field select values of the source file, but use motion vectors just as additional predictors 
minor cleanup
segfault fix

Originally committed as revision 3060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-25 02:09:47 +00:00
Michael Niedermayer
5efe481a15 -qpel option 
Originally committed as revision 3055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-24 13:34:32 +00:00
Timofei V. Bondarenko
2f0472ff81 me_range patch by ("Timofei V. Bondarenko" <timm at ipi dot ac dot ru>) 
Originally committed as revision 3045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 20:39:23 +00:00
Michael Niedermayer
f4f3223ffd reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold 
currently works only with mpeg1/2 source or some luck
may need -sync 0 as otherwise framedrops could lead to extreemly long b frame sequences

Originally committed as revision 3042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 19:06:30 +00:00
Michael Niedermayer
8857a7ef32 10l 
Originally committed as revision 3034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-18 21:59:42 +00:00
Michael Niedermayer
e31d863ede pts fix / b frame segfault fix 
Originally committed as revision 3030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-18 13:43:23 +00:00
Michael Niedermayer
2de28abbfd 10l (segfault fix) 
Originally committed as revision 3029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-18 11:22:35 +00:00
Michael Niedermayer
a4d36c1113 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder 
moving ref_index from Picture to AVFrame

Originally committed as revision 3028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 19:41:49 +00:00
Michael Niedermayer
bf17ff617b stream copy pts fix 
Originally committed as revision 3025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 03:34:17 +00:00
Michael Niedermayer
37f5cd5a18 10l (stats didnt include av_write_trailer()) 
Originally committed as revision 3015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-15 16:34:38 +00:00
Michael Niedermayer
1008ceb380 print video/audio/global_header size and muxing overhead 
Originally committed as revision 3014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-15 13:57:55 +00:00
Allen Day
d223532c23 printf macro patch by (Allen Day <allenday at ucla dot edu>) 
Originally committed as revision 2998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-11 13:54:40 +00:00
Allen Day
d8019eb5d8 verbosity patch by (Allen Day <allenday at ucla dot edu>) 
Originally committed as revision 2997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-11 13:50:42 +00:00
Michael Niedermayer
b2e3c52814 require the user to explicitly specifiy --enable-gpl before enabling of gpl parts becomes possible 
print correct license if --enable-gpl is specified

Originally committed as revision 2985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-09 14:50:00 +00:00
Todd Kirby
1ff93ffcd4 padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>) 
Originally committed as revision 2982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-08 18:54:40 +00:00
Roman Shaposhnik
4568325a18 * making it possible to specify recording date and time in a stream 
Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-06 06:31:12 +00:00
Michael Niedermayer
64c020a8ab 10000l 
Originally committed as revision 2966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-05 10:27:26 +00:00
Michael Niedermayer
0a3b044718 pass frame_size for stream copy 
Originally committed as revision 2943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-01 19:16:24 +00:00
Wolfram Gloger
6fb316d563 Support raw mpegts streams from dvr patch by (wmglo at dent dot med dot uni-muenchen dot de) 
Originally committed as revision 2931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-26 17:40:40 +00:00
Michael Niedermayer
d7646d7d93 h263 loop filter option 
Originally committed as revision 2930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-26 17:31:00 +00:00
Michael Niedermayer
458eaddad1 slice structured encoding support & interlaced spelling 
Originally committed as revision 2906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-18 22:51:42 +00:00
Michael Niedermayer
950b55d3e2 wrong help text 
Originally committed as revision 2904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-18 21:56:53 +00:00
Leon van Stuivenberg
b51469a0c5 tcp select() check and enables pressing 'q' when reading/(writing) from 
tcp/http in ffmpeg.c patch by (Leon van Stuivenberg <l dot vanstuivenberg at chello dot nl>)

Originally committed as revision 2891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 19:40:43 +00:00
Michael Niedermayer
3738fe1ae4 nicer output for 'ffmpeg -formats' 
Originally committed as revision 2870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-11 01:12:30 +00:00
Michael Niedermayer
c4e3724713 write trailer before closing codecs as otherwise accesses to extradata in write_trailer() will cause a segfault 
Originally committed as revision 2852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-05 22:51:22 +00:00
Michel Bardiaux
bc874daea8 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-03 15:41:21 +00:00
Michael Niedermayer
9740beffc6 use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0 
move AV_NOPTS_VALUE & AV_TIME_BASE from avformat.h -> avcodec.h
related fixes

Originally committed as revision 2814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-25 17:35:52 +00:00
Michael Niedermayer
c62c07d3d7 multithreaded mpeg2 decoding 
Originally committed as revision 2810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-23 20:56:56 +00:00
Hauke Duden
2451592652 improved VCD support patch by ("Hauke Duden" <H.NS.Duden at gmx dot net>) 
- the first audio and video packs now contain only a system header and lots
  of padding.
  - no system headers in any packs other than the first ones
  - the two system headers only contain information about "their" stream
  - fixed some header values (muxrate, some flags, ...) so that they have the
  values specified by the standard
  - padding packs are inserted if the mux rate would be below 75 packs per
  second (the rate must not be below or above that value).
  - fixed the SCR of the packs
  - 20 zero bytes are now inserted at the end of each audio pack, after the
  data packet

Originally committed as revision 2804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-19 22:34:13 +00:00
Michael Niedermayer
16806499fc w32threads by (Gildas Bazin <gbazin at altern dot org>) 
Originally committed as revision 2803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-19 20:29:26 +00:00
Michael Niedermayer
50ee2c4131 fix image resize 
Originally committed as revision 2785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 17:20:42 +00:00