videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-23 12:41:29 +02:00
Code Releases Activity
71,740 Commits 36 Branches 392 Tags 210 MiB
91305c6026
Commit Graph

71740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vittorio Giovara
1746dc382d hqxdsp.h: #include "stddef.h" 
It is required by ptrdiff_t, fixes make checkheaders.
 2015-04-20 19:19:23 +01:00
wm4
1e2e22ec61 fate: gapless: fix mp3 tests 
Seeking to a negative time did not have the desired effect of seeking to
the next valid position (the file start). On the other hand, just
"-ss 0" will normally seek to a position higher than 0, because it adds
the start time of the file. (The start time is not 0 because the gapless
code skips a few samples from the start.)

Fix this by using the "-seek_timestamp 1" option, which makes "-ss 0" do
what you'd expect it would do.

Also put the -ss option at the right place, before -i. This actually
makes it seek, instead of something completely else. The ".out-3" test
is no different in the -usetoc 0/1 cases, because the seeking is
inaccurate (in both cases).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 19:50:58 +02:00
wm4
bac7084fbd ffmpeg: add option not to offset seek position by start time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 19:50:58 +02:00
Vittorio Giovara
98cab39798 lavf: Fix variables constness in ff_iso8601_to_unix_time() 
warning: assigning to
      'char *' from 'const char *' discards qualifiers
      [-Wincompatible-pointer-types-discards-qualifiers]
 2015-04-20 18:43:33 +01:00
Michael Niedermayer
57865a9747 avformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 17:41:22 +02:00
Michael Niedermayer
d4cf377947 avformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 17:36:36 +02:00
Michael Niedermayer
e48a0a6c3f avformat/mov: remove per packet timestamp print trace, theres generic code doing this in utils.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 17:25:04 +02:00
Michael Niedermayer
84b95715fa avformat/utils: Place timestamp trace logs under FF_FDEBUG_TS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 17:03:27 +02:00
Michael Niedermayer
d02b3e9bdb avformat/utils: Provide context for av_log() where one is available 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 16:24:47 +02:00
Michael Niedermayer
8a91ee7837 avformat/avidec: Do not call av_log() per byte, use ff_tlog() 
This was av_dlog() previously and should not have been changed to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 16:21:42 +02:00
Vittorio Giovara
86e1a35802 h264_ps: Return meaningful error codes and address a memory leak 
Bug-Id: CID 1026763
 2015-04-20 14:59:40 +01:00
Diego Biurrun
338ed3ed33 ffv1: Pass correct pointers to av_free() 
Bug-Id: CID 1295124
 2015-04-20 14:59:40 +01:00
Michael Niedermayer
1ca8052640 avcodec/parser: Remove duplicate header inlcude 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 14:58:09 +02:00
Michael Niedermayer
42d6d249b0 avutil/mips/generic_macros_msa: volatile doesnt need __ 
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 14:39:50 +02:00
Michael Niedermayer
2a00ef5d81 avcodec/api-flac-test: clear callers context with close_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 14:36:41 +02:00
Ludmila Glinskih
be70c79af2 libavcodec: Add FLAC API test 
Signed-off-by: Ludmila Glinskih <lglinskih@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 14:36:41 +02:00
Michael Niedermayer
09b0f227ce avcodec/flacenc: also count wasted bits in subframe_count_exact() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 14:36:36 +02:00
Michael Niedermayer
1c667626bb Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a' 
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
  jack: Check memory allocation

Conflicts:
	libavdevice/jack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:46:29 +02:00
Timothy Gu
3b1e35d46d fate: Omit the results if the test passed 
The FATE server does not report this information anyway and omitting
it makes the successful run send much less data.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-20 12:41:34 +02:00
Luca Barbato
d34039b171 rmenc: Drop the temporary buffer for ac3 byteswap 
Use direcly avio_w8().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-20 12:41:33 +02:00
Luca Barbato
656e31ed87 ogg: Forward errors further 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-20 12:41:33 +02:00
Thomas Guillem
b18346817d flac: fix realloc loop with invalid flac files 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-20 12:41:33 +02:00
Michael Niedermayer
a6df9ce615 avfilter/buffersrc: Use correct, matching deallocation function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:33:20 +02:00
Martin Storsjö
2cc3936599 dashenc: Add a publishTime field in dynamic manifests 
This field is mandatory in dynamic manifests.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-04-20 13:16:45 +03:00
Michael Niedermayer
0c9e78caf4 Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09' 
* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:15:16 +02:00
Michael Niedermayer
eb8756e4b7 Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6' 
* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 12:12:03 +02:00
Michael Niedermayer
0796a2ab4f Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e' 
* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
  g2meet: Support G2M5 codec variant

Conflicts:
	libavcodec/version.h

See: 4ba5420e4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:52:19 +02:00
Michael Niedermayer
57f49fa0ed Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08' 
* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
  filtfmts: Avoid null pointer dereference

Conflicts:
	libavfilter/filtfmts.c

See: 24326930d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:50:39 +02:00
Michael Niedermayer
94914d6909 Merge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354' 
* commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354':
  avutil: remove pointless bmi1 define

See: a40cee03a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:39:59 +02:00
Michael Niedermayer
a22da5e669 Merge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e' 
* commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e':
  aacdec: consistently use avctx for logging in decode_eld_specific_config

See: 5b75689b98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:39:06 +02:00
Michael Niedermayer
fc83ff80b4 Merge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449' 
* commit '3d71b1f8f09fccea7158e868fb9bd81b81205449':
  mpegvideo_enc: Simplify picture allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:29:43 +02:00
Michael Niedermayer
924a77fb4e Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0' 
* commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0':
  motion_est: Fix warning from zero_cmp() assignment

See: ea41e6d637
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:28:55 +02:00
Michael Niedermayer
127f7aa401 Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797' 
* commit '4d593896aaa81356def8993e8c52294bd8bb2797':
  vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Conflicts:
	libavcodec/vc1_pred.c

See: 6c5bd7d785
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:17:36 +02:00
Michael Niedermayer
4d50d53a6d Merge commit '9286de045968ad456d4e752651eec22de5e89060' 
* commit '9286de045968ad456d4e752651eec22de5e89060':
  mov: Double-check that alias path is not an absolute path

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 11:03:32 +02:00
Michael Niedermayer
82d9c4e578 Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85' 
* commit '376589e5dd72aa2dd42500f456fca303fcdcad85':
  mov: Read alternate absolute path in dref alis

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:51:40 +02:00
Michael Niedermayer
5a284d076f Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437' 
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:28:13 +02:00
Michael Niedermayer
fcca7671e2 Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad' 
* commit 'e6fb844f7b736e72da364032d251283bce9e63ad':
  Implement shared parsing of INFO tag in Canopus family

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:19:46 +02:00
Michael Niedermayer
f1db984288 Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c' 
* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
  fate: Prefix cllc tests with canopus

Conflicts:
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:19:03 +02:00
Michael Niedermayer
1fa7d0902c Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b' 
* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
  hqx: Implement slice-threaded decoding

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

See: eff72a6c73
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 05:11:48 +02:00
Michael Niedermayer
55b866f618 Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93' 
* commit '453642f8afe9f979fcc813a246b1ec656ec36a93':
  hqx: Store shareable data in main decoder context

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:57:06 +02:00
Michael Niedermayer
d8b4e9adbb Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9' 
* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
  hqx: Move DSP related code to a separate file

Conflicts:
	libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:33:06 +02:00
Michael Niedermayer
73e6af9d7b Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905' 
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
  hqx: Merge invalid format check within switch block

Conflicts:
	libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:29:58 +02:00
Michael Niedermayer
dbd94b771f avcodec/internal: Fix ff_dlog() define like av_dlog() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:27:08 +02:00
Michael Niedermayer
0a582aeee4 avcodec: fix build with DEBUG/TRACE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:11:23 +02:00
Michael Niedermayer
8f7b022c8c Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25' 
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
	libavcodec/aacdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/bitstream.c
	libavcodec/dcadec.c
	libavcodec/dnxhddec.c
	libavcodec/dvbsubdec.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/get_bits.h
	libavcodec/gifdec.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/imc.c
	libavcodec/interplayvideo.c
	libavcodec/jpeglsdec.c
	libavcodec/libopencore-amr.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_parser.c
	libavcodec/pngdec.c
	libavcodec/ratecontrol.c
	libavcodec/rv10.c
	libavcodec/svq1dec.c
	libavcodec/vqavideo.c
	libavcodec/wmadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 04:10:10 +02:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Michael Niedermayer
8e8219e0f0 Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e' 
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
  log: Introduce a more verbose debug level

Conflicts:
	doc/APIchanges
	doc/fftools-common-opts.texi
	libavutil/log.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 02:48:19 +02:00
Federico Tomassetti
386e2755aa jack: Check memory allocation 
Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:50:48 +01:00
Federico Tomassetti
617814b4a7 buffersrc: Fix resource leak on error 
Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:50:46 +01:00
Federico Tomassetti
336d2f0979 avplay: Free frame and graph when memory allocation fails 
Bug-Id: CID 1291564
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-04-19 23:45:35 +01:00