a6363e3d89
url: Don't treat slashes in query parameters as directory separators
...
Strip off query parameters from the original url before
applying the new relative path.
Signed-off-by: Martin Storsjö <martin@martin.st >
2012-10-09 14:16:31 +03:00
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
716d413c13
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
2012-10-08 07:13:26 +02:00
513042c926
Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
...
* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd':
avformat: split muxing functions from util.c
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-02 18:20:24 +02:00
82db8ee321
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
...
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-02 14:58:19 +02:00
55f9037f38
avformat: split muxing functions from util.c
2012-10-01 19:57:57 +02:00
31ab1575e5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec: Convert some commented-out printf/av_log instances to av_dlog
avcodec: Drop silly and/or broken printf debug output
avcodec: Drop some silly commented-out av_log() invocations
avformat: Convert some commented-out printf/av_log instances to av_dlog
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
Remove some silly disabled code.
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Conflicts:
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/mjpegdec.c
libavcodec/motion_est_template.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo_enc.c
libavcodec/put_bits.h
libavcodec/ratecontrol.c
libavcodec/wmaenc.c
libavdevice/timefilter.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/avienc.c
libavformat/flvenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-01 16:12:38 +02:00
d3c40a7d1d
avformat: const correctness for av_hex_dump / av_hex_dump_log
2012-10-01 13:18:28 +02:00
72eaba5e4f
avformat: Convert some commented-out printf/av_log instances to av_dlog
2012-10-01 10:24:28 +02:00
44a7a6300d
lavf: free probe data in case we close before probing finished
...
Fixes Ticket1634
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-29 17:33:05 +02:00
2e4ec8947d
lavf: fill in past dts based on reordered pts once the delay becomes known.
...
Previously we had ignored the past dts and just filled in from the
point where we have had sufficient information.
This should fix Ticket1734
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-26 22:58:02 +02:00
a8e3815db5
lavf: factorize timestamp shift in update_initial_timestamps()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-26 22:58:02 +02:00
3ba0dab76a
lavf: Add support offset timestamps on muxing.
...
This allows avoiding negative timestamps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-26 15:55:16 +02:00
299c0b30a6
lavf: fix bug that caused has_decode_delay_been_guessed() to never return !=0
...
Possibly fixes Ticket1724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-26 04:53:03 +02:00
4b80a619b7
Handle the following type of relative URL correctly:
...
http://a/b + //c/d = http://c/d
http://a/b?c + ?d = http://a/b?d
http://a/b?c/d + /e = http://a/e
Updated with feedback from Clément Bœsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-26 03:43:06 +02:00
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
4390f8c28d
Fix two "skiping" typo.
2012-09-25 07:42:32 +02:00
6bcbe768bb
lavf: dont add apic streams for demuxers that dont support it.
...
Fixes crash
Fixes ticket1730
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-25 02:47:09 +02:00
bbe9fe469a
lavf/utils: remove loop on AVERROR(EAGAIN) in av_read_frame()
...
The loop was introduced in 64d340c62a
2012-09-24 21:16:48 +02:00
9eb296572e
lavf: use a malloced AVFrame in try_decode_frame().
...
This allows using avcodec_free_frame() to free it properly.
2012-09-24 12:31:24 +02:00
64d340c62a
lavf/utils: add error check in av_read_frame()
...
In particular, fix crash when the input file contains no packets (e.g. an
ffmeta input).
2012-09-24 00:41:13 +02:00
21c4393f1c
lavf/find_stream_info: make sure we decode at least one frame for DTS
...
The channel layout at the demuxer layer is commonly wrong and would
otherwise be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-23 04:56:51 +02:00
61a84755a9
lavf: dont open a decoder at the top of find_stream_info before probing has finished
...
It could open the wrong decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-23 04:56:21 +02:00
a380f82c53
lavf: allow using request_probe as a score threshold to accept a codec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-23 01:22:16 +02:00
406cdddbdd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libx264: add forgotten ;
matroskadec: fix a sanity check.
matroskadec: only return corrupt packets that actually contain data
lavf: zero data/size of the packet passed to read_packet().
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
ARM: align PIC offset pools to 4 bytes
ARM: swap source operands in some add instructions
configure: update tms470 detection for latest version
lavf probe: prevent codec probe with no data at all seen
motion_est: fix use of inline on extern functions
Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-21 14:44:32 +02:00
1cc569ddda
lavf: zero data/size of the packet passed to read_packet().
2012-09-21 09:14:37 +02:00
6746cd7f61
lavf probe: prevent codec probe with no data at all seen
...
This occurs with fuzzed mpeg-ts files. set_codec_from_probe_data() is
called with a zeroed AVProbeData since no packet made through for
specific stream.
2012-09-20 14:50:06 +02:00
07d2d06395
Remove code that duplicates existing code a few lines down.
...
This also fixes a potential crash since s->pb can be NULL.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2012-09-17 21:17:43 +02:00
f276a490f0
Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'
...
* commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b':
avformat: fix typo in avformat_close_input
mp3enc: write Xing TOC
mp3enc: support MPEG-2 and MPEG-2.5 in Xing header.
mp3enc: downgrade some errors in writing Xing frame to warnings
lavf: flush the output AVIOContext in av_write_trailer().
lavf: cosmetics, reformat av_write_trailer().
avio: flush the internal buffer in avio_close()
Enhance doc on asyncts audiofilter
cmdutils: avoid setting data pointers to invalid values in alloc_buffer()
libavcodec: remove av_destruct_packet_nofree()
Conflicts:
libavcodec/avpacket.c
libavformat/mp3enc.c
libavformat/nutenc.c
libavformat/utils.c
libavformat/version.h
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-16 14:24:11 +02:00
3f7fd59d15
avformat: fix typo in avformat_close_input
...
The condition should not be &&.
2012-09-15 20:23:39 +02:00
3b4bb19e63
lavf: flush the output AVIOContext in av_write_trailer().
...
This is consistent with stdio and is what we want to do in all cases.
Fixes a bug in the voc muxer which didn't flush in write_trailer()
previously. This is the cause of the change in the test results.
2012-09-15 18:25:07 +02:00
0c270239c2
lavf: cosmetics, reformat av_write_trailer().
2012-09-15 18:24:59 +02:00
f1ca40ee00
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
riff: Add SVQ3 fourcc
fate: ac3: add 4.0 and downmix tests
configure: x86: improve ebp availability check
vorbisdec: ensure FASTDIV denominator is never 1
avformat: refactor avformat_close_input
avformat: simplify avformat_close_input
Conflicts:
configure
libavcodec/vorbisdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-15 10:35:26 +02:00
e2d643efcd
lavf/compute_pkt_fields: only run pts by duration correction if reference ts is available
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-14 19:47:41 +02:00
44272c1ccc
avformat: refactor avformat_close_input
...
Do not crash if the input format is not allocated yet.
2012-09-14 14:26:27 +02:00
4d1f443c3d
avformat: simplify avformat_close_input
...
avio_close checks by itself for NULL condition.
2012-09-14 14:26:27 +02:00
062091f87f
compute_pkt_fields2: dont interpret max_b_frames of <0 as there being b frames.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-14 02:30:00 +02:00
8470e6c96f
lavf/avformat_seek_file: fix harmless integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-11 03:02:51 +02:00
41dba453f9
utils/update_stream_timings: fix division by zero
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-10 16:57:31 +02:00
b422e2c58a
compute_pkt_fields: fix harmless integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-10 16:15:07 +02:00
8a0118b4b4
ffio_read: dont spam the user at EOF with a truncation error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-08 12:41:57 +02:00
25f139e72f
lavf/utils: fix typo in has_codec_parameters
...
Replace "unspecified sample size" with "unspecified frame size". +10l.
2012-09-07 14:31:37 +02:00
a7fbc7d7b7
lavf: factor codec id forcing out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-07 13:16:04 +02:00
29e972f67c
lavu/parseutils: add av_small_strptime()
...
Make internal small_strptime() function public, and use it in place of
strptime().
This allows to avoid a dependency on strptime() on systems which do not
support it.
In particular, fix trac ticket #992 .
2012-09-06 00:40:01 +02:00
5620088494
lavf: fix a few typo in some comments.
2012-09-05 23:22:35 +02:00
9d9f34a3c1
lavf: remove a few useless AV_NOWARN_DEPRECATED().
...
read_seek was undeprecated in e5c708151
2012-09-05 23:18:07 +02:00
19d8954966
find_stream_info: update last_dts more often
...
This improves dts validity checks and consequently fps detection of files with invalid dts
Fixes Ticket1681
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-30 23:48:54 +02:00
12b1512e85
lavf/utils: Try to unwrap pts/dts so as to minimize wraps
...
Based on code by: Andrey Utkin <andrey.krieger.utkin@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-24 03:08:51 +02:00
254917f078
lavf/utils: run update_initial_timestamps() outside some if()
...
This way it gets executed earlier and updated timestamps become available earlier.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-24 03:07:03 +02:00
26ec392a0e
lavf: remove unused AVStream pointer.
2012-08-21 13:48:08 +02:00
