e7389ed5d0
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
...
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:00:59 +02:00
66c92a1575
examples/resampling_audio: make use of av_samples_alloc_array_and_samples()
...
Simplify.
2013-03-31 18:00:45 +02:00
9bb25dbd13
examples/filtering_*: constify AVFrame * for print_frame() and display_frame() functions
2013-03-14 21:39:15 +01:00
9076a6a943
examples/filtering_audio: update to new API
...
In particular, fix crash.
2013-03-14 21:39:09 +01:00
f0da370a52
examples/filtering_video: update to new API
...
In particular, fix crash.
2013-03-14 21:39:01 +01:00
ceac5c54dd
Remove references to the "ff" variant of buffersink.
2013-03-12 23:31:07 +01:00
5743095ca9
Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'
...
* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
avconv: print an error on applying options of the wrong type.
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
output-example: Update to use encode_video2 instead of the now dropped encode_video
Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 18:10:35 +01:00
5e4bc96415
doc: fix examples.
2013-03-10 01:41:53 +01:00
9b211c43dc
examples/muxing: fix memory leak.
...
Do not re-call avcodec_get_context_defaults3(), it is already
called by avformat_new_stream() and it leaks the codec
priv_data that was already allocated.
Use avformat_free_context() instead of freeing (not)
everything manually.
Fix trac ticket #2322 .
2013-03-05 15:43:32 +01:00
5ade6bfb03
doc/examples/demuxing: use AVFrame accessor functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 22:40:50 +01:00
dcc73aaaa9
doc/examples: do not allocate AVFrame directly.
...
The size of the AVFrame structure is not part of the ABI;
it can grow with later versions. Therefore, applications
are not supposed to allocate AVFrame directly, they are
supposed to use avcodec_alloc_frame() instead.
2013-02-17 15:51:50 +01:00
772b949d8e
examples/scaling_video: fix typo
2013-02-15 00:28:53 +01:00
e7a39e163d
examples/demuxing: free AVPacket after usage
...
Fix leak.
2013-01-15 23:37:30 +01:00
48a7981e6f
doc/examples: fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 05:05:20 +01:00
e4f14c32b9
examples/muxing: improve error messages.
...
Illustrate the use of return values, av_err2str and
avcodec_get_name.
2013-01-02 17:42:00 +01:00
55b243cade
doc/examples/resampling_audio.c: fix path
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16 21:37:23 +01:00
89920387da
examples: add resampling_audio.c file
2012-12-06 10:09:37 +01:00
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
e8c0b6710c
examples/muxing: fix typo: allocated -> allocate
2012-11-06 11:28:28 +01:00
7f6f8f642c
examples/demuxing: fix braino
...
s/video/audio/ in a log message.
2012-11-06 01:10:12 +01:00
794cea588c
examples/demuxing: dump input information *after* trying to open audio stream
...
Implement more logical code flow.
2012-11-06 01:10:12 +01:00
ca28cb5f83
examples: fix doxy so they appear on the example page
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 16:32:32 +02:00
33c4535db7
examples/decoding_encoding: add and use the decode_write_frame function
...
Allow to factorize code in video_decode_example(), simplify.
2012-10-24 00:29:37 +02:00
d3b8d56e06
examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame
...
Decrease confusion.
2012-10-20 19:42:55 +02:00
935ecfb002
examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame()
2012-10-20 12:06:45 +02:00
7b116a94af
examples/decoding_encoding: fix misc typos in the usage text
2012-10-20 11:30:13 +02:00
8c4753f7f5
examples/decoding_encoding: remove misplaced and confusing comment
2012-10-20 11:30:13 +02:00
6d6ccbae4c
examples/decoding_encoding: add missing checks on avcodec_alloc_context3()
2012-10-20 11:30:13 +02:00
eebde404bc
examples/muxing: merge add_audio_stream() and add_video_stream()
...
Factorize.
2012-10-17 21:39:13 +02:00
eda0a52bf1
examples/muxing: check on frame
...
Fix crash in case frame is not defined (e.g. with muxing out.wav).
2012-10-17 21:39:13 +02:00
d6196d9421
examples/muxing: fix bogus setting of st->id
2012-10-17 21:39:12 +02:00
5ca298df2d
examples/muxing: remove misleading comment about pending API change
...
The API was never changed since 2003. Replace with a comment about the
performed operation.
2012-10-17 21:39:12 +02:00
1f7962625c
examples/muxing: remove video_outbuf unused and useless code
2012-10-17 21:39:12 +02:00
7b8fd29816
examples/muxing: fix video pts
...
Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 02:40:00 +02:00
7ca102a7d7
examples: add README file with simple compilation instructions
2012-10-16 13:34:48 +02:00
a726ac9a11
examples/muxing: extend usage notice
2012-10-15 21:36:14 +02:00
59e31aa2ca
examples/muxing: provide more information in case of avcodec_open2 failure
2012-10-15 15:35:50 +02:00
6133149e0c
examples/muxing: add missing error checks
2012-10-15 15:35:50 +02:00
e56b3a5ebb
examples/muxing: fix case inconsistency in message
2012-10-15 15:35:49 +02:00
ac627b3d38
Merge commit '716d413c13981da15323c7a3821860536eefdbbb'
...
* commit '716d413c13981da15323c7a3821860536eefdbbb':
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Conflicts:
doc/examples/muxing.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
libavcodec/8bps.c
libavcodec/aasc.c
libavcodec/aura.c
libavcodec/avcodec.h
libavcodec/avs.c
libavcodec/bfi.c
libavcodec/bmp.c
libavcodec/bmpenc.c
libavcodec/c93.c
libavcodec/cscd.c
libavcodec/cyuv.c
libavcodec/dpx.c
libavcodec/dpxenc.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/ffv1.c
libavcodec/flashsv.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/iff.c
libavcodec/imgconvert.c
libavcodec/indeo3.c
libavcodec/kmvc.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/ljpegenc.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/motionpixels.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo_enc.c
libavcodec/pamenc.c
libavcodec/pcxenc.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/ptx.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrleenc.c
libavcodec/raw.c
libavcodec/rawdec.c
libavcodec/rl2.c
libavcodec/sgidec.c
libavcodec/sgienc.c
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/sunrast.c
libavcodec/targa.c
libavcodec/targaenc.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/tmv.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/vb.c
libavcodec/vp3.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/xwddec.c
libavcodec/xwdenc.c
libavcodec/yop.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/formats.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_hflip.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/movenc.c
libavformat/mxf.h
libavformat/utils.c
libavformat/yuv4mpeg.c
libavutil/imgutils.c
libavutil/pixdesc.c
libswscale/input.c
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/x86/yuv2rgb_template.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 21:06:57 +02:00
46a35959d8
Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'
...
* commit '7751e4693dd10ec98c20fbd9887233b575034272':
ogg: check that the expected number of headers had been parsed
libx264: change default to closed gop to match x264cli
Use avcodec_free_frame() to free AVFrames.
lavf: use a malloced AVFrame in try_decode_frame().
lavc: add avcodec_free_frame().
lavc: ensure extended_data is set properly on decoding
lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
lavc: use av_mallocz to allocate AVFrames.
lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/src_movie.c
libavformat/oggdec.c
libavformat/oggdec.h
libavformat/oggparsetheora.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25 15:15:16 +02:00
51fa653829
examples/decoding_encoding: clarify operations in the usage message
2012-09-13 22:19:45 +02:00
bcf93f78a5
examples/decoding_encoding: replace "picture" with "frame" in encode_example()
...
The use of "picture" in place of "frame" is confusing.
2012-09-13 20:49:59 +02:00
70b671a283
examples/decoding_encoding: apply various message log fixes
2012-09-13 20:49:59 +02:00
34b5b735f9
examples/muxing: add check on avformat_write_header() result
2012-09-11 21:43:27 +02:00
b3e2975ab3
examples/muxing: apply misc fixes to log messages
2012-09-11 21:43:27 +02:00
1d0048cfe3
examples/muxing: rename img_convert_ctx to sws_ctx
...
The new name is more consistent with the codebase, and more
self-consistent with the libswscale API.
2012-09-11 21:43:18 +02:00
976bb42aca
examples/muxing: merge some declarations and definitions
2012-09-11 21:41:56 +02:00
bdd9bfbbab
examples/muxing: prefer AVPicture to AVFrame, when feasible
...
Favor the use of plain AVPicture over AVFrame, especially when the use of
AVFrame is not required like in the case of tmp_picture.
Also adopt more straightforward names, to avoid frame/picture confusion.
2012-09-11 21:41:56 +02:00
2fe8fd3948
examples/demuxing: add audio decoding/demuxing
2012-09-11 17:48:07 +02:00
Michael Niedermayer
Stefano Sabatini
Nicolas George
Clément Bœsch
Angelo Haller