diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:19 +0200 |
| commit | 563fe360c356c0144badd63063c16dae989b5379 (patch) | |
| tree | 38b250fdf76bf31fa5e3c7c91fc9a0456f57f98d /ffserver.c | |
| parent | 73a502dd436425875fae1305d47cf0c1fbf24d68 (diff) | |
| parent | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (diff) | |
| download | ffmpeg-563fe360c356c0144badd63063c16dae989b5379.tar.gz | |
Merge commit 'd7e5aeb' into oldabi
* commit 'd7e5aeb': (24 commits)
Fix runtime CPU detection in libswscale.
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
...
Conflicts:
libavcodec/version.h
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index e5e1a268f5..ed4ef54bc3 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2187,10 +2187,8 @@ static int open_input_stream(HTTPContext *c, const char *info) } } -#if 1 if (c->fmt_in->iformat->read_seek) av_seek_frame(c->fmt_in, -1, stream_pos, 0); -#endif /* set the start time (needed for maxtime and RTP packet timing) */ c->start_time = cur_time; c->first_pts = AV_NOPTS_VALUE; |