Michael Niedermayer
5ade6bfb03
doc/examples/demuxing: use AVFrame accessor functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 22:40:50 +01:00
Nicolas George
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
Stefano Sabatini
772b949d8e
examples/scaling_video: fix typo
2013-02-15 00:28:53 +01:00
Angelo Haller
e7a39e163d
examples/demuxing: free AVPacket after usage
...
Fix leak.
2013-01-15 23:37:30 +01:00
Michael Niedermayer
48a7981e6f
doc/examples: fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 05:05:20 +01:00
Nicolas George
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
Michael Niedermayer
55b243cade
doc/examples/resampling_audio.c: fix path
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16 21:37:23 +01:00
Stefano Sabatini
89920387da
examples: add resampling_audio.c file
2012-12-06 10:09:37 +01:00
Michael Niedermayer
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
Stefano Sabatini
e8c0b6710c
examples/muxing: fix typo: allocated -> allocate
2012-11-06 11:28:28 +01:00
Stefano Sabatini
7f6f8f642c
examples/demuxing: fix braino
...
s/video/audio/ in a log message.
2012-11-06 01:10:12 +01:00
Stefano Sabatini
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
Michael Niedermayer
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
Stefano Sabatini
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
Stefano Sabatini
d3b8d56e06
examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame
...
Decrease confusion.
2012-10-20 19:42:55 +02:00
Stefano Sabatini
935ecfb002
examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame()
2012-10-20 12:06:45 +02:00
Stefano Sabatini
7b116a94af
examples/decoding_encoding: fix misc typos in the usage text
2012-10-20 11:30:13 +02:00
Stefano Sabatini
8c4753f7f5
examples/decoding_encoding: remove misplaced and confusing comment
2012-10-20 11:30:13 +02:00
Stefano Sabatini
6d6ccbae4c
examples/decoding_encoding: add missing checks on avcodec_alloc_context3()
2012-10-20 11:30:13 +02:00
Stefano Sabatini
eebde404bc
examples/muxing: merge add_audio_stream() and add_video_stream()
...
Factorize.
2012-10-17 21:39:13 +02:00
Stefano Sabatini
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
Stefano Sabatini
d6196d9421
examples/muxing: fix bogus setting of st->id
2012-10-17 21:39:12 +02:00
Stefano Sabatini
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
Stefano Sabatini
1f7962625c
examples/muxing: remove video_outbuf unused and useless code
2012-10-17 21:39:12 +02:00
Michael Niedermayer
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
Stefano Sabatini
7ca102a7d7
examples: add README file with simple compilation instructions
2012-10-16 13:34:48 +02:00
Stefano Sabatini
a726ac9a11
examples/muxing: extend usage notice
2012-10-15 21:36:14 +02:00
Stefano Sabatini
59e31aa2ca
examples/muxing: provide more information in case of avcodec_open2 failure
2012-10-15 15:35:50 +02:00
Stefano Sabatini
6133149e0c
examples/muxing: add missing error checks
2012-10-15 15:35:50 +02:00
Stefano Sabatini
e56b3a5ebb
examples/muxing: fix case inconsistency in message
2012-10-15 15:35:49 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Stefano Sabatini
51fa653829
examples/decoding_encoding: clarify operations in the usage message
2012-09-13 22:19:45 +02:00
Stefano Sabatini
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
Stefano Sabatini
70b671a283
examples/decoding_encoding: apply various message log fixes
2012-09-13 20:49:59 +02:00
Stefano Sabatini
34b5b735f9
examples/muxing: add check on avformat_write_header() result
2012-09-11 21:43:27 +02:00
Stefano Sabatini
b3e2975ab3
examples/muxing: apply misc fixes to log messages
2012-09-11 21:43:27 +02:00
Stefano Sabatini
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
Stefano Sabatini
976bb42aca
examples/muxing: merge some declarations and definitions
2012-09-11 21:41:56 +02:00
Stefano Sabatini
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
Stefano Sabatini
2fe8fd3948
examples/demuxing: add audio decoding/demuxing
2012-09-11 17:48:07 +02:00
Stefano Sabatini
3b34cbce19
examples/scaling_video: write to rawvideo file
...
This is more useful for testing purposes. Also allow to specify the name
of the output file.
2012-09-04 11:29:28 +02:00
Stefano Sabatini
c8ef309379
examples: add demuxing.c example
2012-09-02 10:48:01 +02:00
Michael Niedermayer
3061664a57
avoid ambigous buffersink names
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-01 06:05:08 +02:00
Stefano Sabatini
db0a0aa243
examples/scaling_video: add logging in case of image allocation failure
2012-08-30 23:39:32 +02:00
Stefano Sabatini
952caf11f2
examples/muxing: remove pointless #undef exit
2012-08-30 23:39:32 +02:00
Stefano Sabatini
cb6defb053
examples/scaling_video: consistently use printf rather than av_log()
2012-08-30 21:48:50 +02:00
Stefano Sabatini
078e203379
examples/scaling_video: add file doxy
2012-08-30 21:48:24 +02:00
Stefano Sabatini
e53becc70f
examples/Makefile: give priority to pkg-config flags
...
In case CFLAGS/LDLIBS are already defined and conflicting with the
pkg-config flags, give priority to the latter since they are used to
detect compilation flags.
This should fix for example the case where there are many different
instances of a library, CFLAGS=-I/foo/include and pkg-config cflags say
-I/bar/include.
2012-08-30 21:46:44 +02:00
Stefano Sabatini
2cbffc6706
examples/Makefile: remove duplicated -f switch
...
$(RM) already includes that flag.
Spotted-by: ubitux
2012-08-28 20:09:42 +02:00