diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:09:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:17:07 +0200 |
| commit | d4d09329eef30787da699c7a397b00f6f96940bc (patch) | |
| tree | 3605d4e30063b924254a373e270026bca6436f11 /libavformat/utils.c | |
| parent | a61bc91d42945e6ccefef4867ef32d2073f8f8c7 (diff) | |
| parent | 0c68c804196400de3c40c8849124b292ed62b99c (diff) | |
| download | ffmpeg-d4d09329eef30787da699c7a397b00f6f96940bc.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d9aa6f1173..835408bc32 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -219,7 +219,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, #if CONFIG_IMAGE2_MUXER if (!short_name && filename && av_filename_number_test(filename) && - av_guess_image2_codec(filename) != CODEC_ID_NONE) { + ff_guess_image2_codec(filename) != CODEC_ID_NONE) { return av_guess_format("image2", NULL, NULL); } #endif @@ -272,7 +272,7 @@ enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, #if CONFIG_IMAGE2_MUXER if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ - codec_id= av_guess_image2_codec(filename); + codec_id= ff_guess_image2_codec(filename); } #endif if(codec_id == CODEC_ID_NONE) @@ -3574,22 +3574,26 @@ static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int av_hex_dump(f, pkt->data, pkt->size); } +#if FF_API_PKT_DUMP void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload) { AVRational tb = { 1, AV_TIME_BASE }; pkt_dump_internal(NULL, f, 0, pkt, dump_payload, tb); } +#endif void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st) { pkt_dump_internal(NULL, f, 0, pkt, dump_payload, st->time_base); } +#if FF_API_PKT_DUMP void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload) { AVRational tb = { 1, AV_TIME_BASE }; pkt_dump_internal(avcl, NULL, level, pkt, dump_payload, tb); } +#endif void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload, AVStream *st) |