Michael Niedermayer
|
526cb36e4b
|
Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2012-10-11 15:46:48 +02:00 |
|
Stefano Sabatini
|
206c34e17d
|
lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio
Should be more robust/consistent.
|
2012-09-10 18:52:28 +02:00 |
|
Stefano Sabatini
|
722762f7e1
|
lavfi/setpts: add FRAME_RATE constant
Useful for dealing with constant frame-rate video.
|
2012-09-10 18:52:28 +02:00 |
|
Stefano Sabatini
|
b66afe087a
|
lavfi/asetpts,setpts: rework debug log
Show more information, and only the information stored in the values
array. Improve debugging usefulness.
|
2012-08-24 13:32:59 +02:00 |
|
Stefano Sabatini
|
1181461ca5
|
lavfi/asetpts,setpts: add variables T, STARTT, PREV_INT and PREV_OUTT
|
2012-08-24 13:32:21 +02:00 |
|
Stefano Sabatini
|
0b9a915dad
|
lavfi: rename vf_setpts.c to f_setpts.c
The file contains the asetpts audio filter.
|
2012-08-24 12:54:45 +02:00 |
|