summaryrefslogtreecommitdiff
path: root/ffplay.c
Commit message (Collapse)AuthorAge
* ffplay: reque attached pictures on channel changes.Michael Niedermayer2012-08-16
| | | | | | | Fixes Ticket1473 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: avoid SDL_atoi()Michael Niedermayer2012-08-12
| | | | | | | | It appears this function is not available everywhere Should fix Ticket1525 Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: fix warning that i just mistakenly introducedMichael Niedermayer2012-07-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffplay: fix planar audioMichael Niedermayer2012-07-20
| | | | | | This caused ALAC to fail since the last merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Consistently use C-style comments with multiple inclusion guards anm: fix a few Doxygen comments misc typo and wording fixes attributes: add av_noreturn attributes: drop pointless define guards configure: do not disable av_always_inline with --enable-small flvdec: initial stream switch support avplay: fix write on freed memory for rawvideo snow: remove a VLA used for edge emulation x86: lavfi: fix gradfun/yadif build with mmx/sse disabled snow: remove the runs[] VLA. snow: Check mallocs at init flacdec: remove redundant setting of avctx->sample_fmt Conflicts: ffplay.c libavcodec/h264.c libavcodec/snow.c libavcodec/snow.h libavcodec/snowdec.c libavcodec/snowenc.c libavformat/flvdec.c libavutil/attributes.h tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2012-07-01
|\ \ | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: only configure video filters after we got the first frame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: only configure video filters after we got the first frameMarton Balint2012-06-30
| | | | | | | | | | | | | | | | | | Otherwise the codec width, height and pixel format values may not be set. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-30
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section. dnxhdenc: add space between function argument type and comment. x86: fmtconvert: add special asm for float_to_int16_interleave_misc_* attributes: Add a definition of av_always_inline for MSVC cmdutils: Pass the actual chosen encoder to filter_codec_opts os_support: Add fallback definitions for stat flags os_support: Rename the poll fallback function to ff_poll network: Check for struct pollfd os_support: Don't compare a negative number against socket descriptors os_support: Include all the necessary headers for the win32 open function x86: vc1: fix and enable optimised loop filter Conflicts: cmdutils.c cmdutils.h ffmpeg.c ffplay.c libavformat/os_support.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: factorize expression in audio_decode_frame()Stefano Sabatini2012-06-30
| | | | | | | | Possibly improve readability.
* | ffplay: group together and vertically align correlated parameters in log ↵Stefano Sabatini2012-06-29
| | | | | | | | | | | | function Possibly improve readability.
* | ffplay: vertially align complex if condition in audio_decode_frame()Stefano Sabatini2012-06-29
| | | | | | | | Possibly improve readability.
* | ffplay: move assignment in else block in audio_decode_frame()Stefano Sabatini2012-06-29
| | | | | | | | | | Avoid confusing and pointless double assignment of variable resampled_data_size.
* | ffplay: split overly long line in audio_decode_frame()Stefano Sabatini2012-06-29
| |
* | ffplay: avoid useless NULL checks in swr_free()Stefano Sabatini2012-06-29
| | | | | | | | | | swr_free() already checks for nullness, no need to add the check in calling code.
* | ffplay: fix wrong reference to function in audio_decode_frame() commentStefano Sabatini2012-06-29
| | | | | | | | | | The comment now references swr_convert(), rather than audio_convert(), which was deprecated and/or dropped.
* | ffplay: simplify code by using avfilter_unref_bufferp()Stefano Sabatini2012-06-28
| |
* | lavfi: deprecate av_buffersrc_buffer() functionStefano Sabatini2012-06-28
| | | | | | | | Favor av_buffersrc_add_ref() instead, which is more powerful.
* | ffplay: add configure_filtergraph() helperStefano Sabatini2012-06-26
| | | | | | | | | | Will help factorization with the pending -af patch, and add some checks missing in the original code.
* | lavfi: remove old video sink APIStefano Sabatini2012-06-26
| | | | | | | | | | It was deprecated since a long time and removed after the 2->3 major bump.
* | ffplay: give more meaningful names to the buffersink instancesStefano Sabatini2012-06-25
| |
* | lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref APIStefano Sabatini2012-06-25
| | | | | | | | | | | | | | | | | | | | | | Deprecate functions: avfilter_fill_frame_from_buffer_ref avfilter_fill_frame_from_audio_buffer_ref avfilter_fill_frame_from_video_buffer_ref and schedule to drop them at the next API major bump. The function avfilter_copy_buf_props() should be used instead.
* | ffplay: add cast to fix warning in configure_video_filters()Stefano Sabatini2012-06-23
| | | | | | | | | | | | Fix warning: ffplay.c:1578:40: warning: passing argument 5 of ‘avfilter_graph_create_filter’ discards ‘const’ qualifier from pointer target type [enabled by default] libavfilter/avfiltergraph.h:84:5: note: expected ‘void *’ but argument is of type ‘const enum PixelFormat *’
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix -vismv 1Michael Niedermayer2012-06-17
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: rename buffer source instance from "src" to "ffplay_buffer"Stefano Sabatini2012-06-17
| | | | | | | | | | | | The new name is more descriptive. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use key=val syntax for the buffersrc argsStefano Sabatini2012-06-17
| | | | | | | | | | | | | | Fix warning: [src @ ...] Flat options syntax is deprecated, use key=value pairs. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Avoid C99 variable declarations within for statements. rtmp: Read and handle incoming packets while writing data doc: document THREAD_TYPE fate variable rtpdec: Don't require frames to start with a Mode A packet avconv: don't try to free threads that were not initialized. Conflicts: doc/fate.texi ffplay.c libavdevice/dv1394.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: fix return value of get_video_frame if avcodec_decode_video failsMarton Balint2012-06-09
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: reset AVFrame to defaults before decoding each new frame.Michael Niedermayer2012-06-08
| | | | | | | | | | | | | | | | This fixes: ffplay -f lavfi -i cellauto This was a regression since factorizing the filter code with ffmpeg. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: check return code of avcodec_decode_video2()Michael Niedermayer2012-06-08
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix build if avfilter is disabledMarton Balint2012-06-07
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix frame_delay calculation in new avfilter codeMarton Balint2012-06-07
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add support for changing pixel formatMarton Balint2012-06-07
| | | | | | | | | | | | | | | | With the filtering code refactored, it was much easier to finally fix this. Fixes ticket 123 and 238. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add missing filt_in assignment after video filter reconfigureMarton Balint2012-06-07
| | | | | | | | | | | | Fixes segfaults on changing resolution. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix frame aspect ratio after qatar mergeMarton Balint2012-06-07
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix use after freeMichael Niedermayer2012-06-07
| | | | | | | | | | | | | | | | | | reproduceable with: ffmpeg -i tests/lena.pnm -pix_fmt pal8 -vcodec rawvideo -s 512x512 out.avi valgrind ffplay_g out.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: use dummy video driver if display is disabledMarton Balint2012-06-07
| | | | | | | | | | | | Fixes ticket 1402. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: calculate audio diff threshold based on the actual settingsMarton Balint2012-06-02
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: try more channel count combinations for SDL_OpenAudioMarton Balint2012-06-02
| | | | | | | | | | | | This should fix ticket 1384. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: simplify audio_open, rename parameters to more explanatory namesMarton Balint2012-06-02
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove VideoState from audio_openMarton Balint2012-06-02
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: put audio parameters to their own structMarton Balint2012-06-02
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: put audio_open into a seperate functionMarton Balint2012-06-02
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove VideoPicture pix_fmt and use frame pixel format insteadMarton Balint2012-05-29
| | | | | | | | | | | | | | | | | | VideoPicture pixel format is set at allocation time, therefore it is not reflecting the proper value. Fixes files with changing pixel format in the avfilter disabled case. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8Marton Balint2012-05-29
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: add pause audio feature in the middle of a packetMarton Balint2012-05-29
| | | | | | | | | | | | Fixes ticket 215. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: remove VideoPicture duration fieldMarton Balint2012-05-29
| | | | | | | | | | | | We are not using it. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: force exit when filter configuration failsMarton Balint2012-05-24
| | | | | | | | | | | | | | | | | | Switching to visualization instead of exiting ffplay is a bit more tricky, so just exit for now. Fixes ticket 38. Signed-off-by: Marton Balint <cus@passwd.hu>