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