diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-26 16:07:04 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-26 16:24:57 +0400 |
commit | 507f2940ccdcedf2fdc064c5fb6022b60bace8ca (patch) | |
tree | a367ef88e7671ef3155d52bf0f8137fc1c2b0339 /libavformat/rawdec.c | |
parent | 9f36ec6aa936515a703f6d7ff32826aa28684f1e (diff) | |
parent | 1b891d17c531e8a63c2974aab4bf997ce70746f3 (diff) |
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
avconv: fix bitrate report when writing to /dev/null
avfilter: fix graphparser memleaks on error paths
rawdec: remove ff_raw_read_header
pcmdec: remove dependency from rawdec
g722: refactor out of rawdec.c
rawvideo: use a specific read_header
Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rawdec.c')
-rw-r--r-- | libavformat/rawdec.c | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 4020666ed8..07c2782c67 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -29,82 +29,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" -/* raw input */ -int ff_raw_read_header(AVFormatContext *s) -{ - AVStream *st; - enum AVCodecID id; - - st = avformat_new_stream(s, NULL); - if (!st) - return AVERROR(ENOMEM); - - id = s->iformat->raw_codec_id; - if (id == AV_CODEC_ID_RAWVIDEO) { - st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - } else { - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - } - st->codec->codec_id = id; - - switch(st->codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: { - RawAudioDemuxerContext *s1 = s->priv_data; - - st->codec->channels = 1; - - if (id == AV_CODEC_ID_ADPCM_G722) - st->codec->sample_rate = 16000; - - if (s1 && s1->sample_rate) - st->codec->sample_rate = s1->sample_rate; - if (st->codec->sample_rate <= 0) { - av_log(s, AV_LOG_WARNING, "Invalid sample rate %d specified using default of 44100\n", - st->codec->sample_rate); - st->codec->sample_rate= 44100; - } - - if (s1 && s1->channels) - st->codec->channels = s1->channels; - - st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id); - av_assert0(st->codec->bits_per_coded_sample > 0); - st->codec->block_align = st->codec->bits_per_coded_sample*st->codec->channels/8; - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); - break; - } - case AVMEDIA_TYPE_VIDEO: { - FFRawVideoDemuxerContext *s1 = s->priv_data; - int width = 0, height = 0, ret = 0; - enum AVPixelFormat pix_fmt; - AVRational framerate; - - if (s1->video_size && (ret = av_parse_video_size(&width, &height, s1->video_size)) < 0) { - av_log(s, AV_LOG_ERROR, "Couldn't parse video size.\n"); - goto fail; - } - if ((pix_fmt = av_get_pix_fmt(s1->pixel_format)) == AV_PIX_FMT_NONE) { - av_log(s, AV_LOG_ERROR, "No such pixel format: %s.\n", s1->pixel_format); - ret = AVERROR(EINVAL); - goto fail; - } - if ((ret = av_parse_video_rate(&framerate, s1->framerate)) < 0) { - av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n", s1->framerate); - goto fail; - } - avpriv_set_pts_info(st, 64, framerate.den, framerate.num); - st->codec->width = width; - st->codec->height = height; - st->codec->pix_fmt = pix_fmt; -fail: - return ret; - } - default: - return -1; - } - return 0; -} - #define RAW_PACKET_SIZE 1024 int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt) @@ -181,18 +105,6 @@ const AVOption ff_rawvideo_options[] = { { NULL }, }; -#if CONFIG_G722_DEMUXER -AVInputFormat ff_g722_demuxer = { - .name = "g722", - .long_name = NULL_IF_CONFIG_SMALL("raw G.722"), - .read_header = ff_raw_read_header, - .read_packet = ff_raw_read_partial_packet, - .flags = AVFMT_GENERIC_INDEX, - .extensions = "g722,722", - .raw_codec_id = AV_CODEC_ID_ADPCM_G722, -}; -#endif - #if CONFIG_LATM_DEMUXER AVInputFormat ff_latm_demuxer = { .name = "latm", |