diff --git a/util/demux.c b/util/demux.c
index e932ac4e2364df41ae4ecf89c84ba110ab0fdf28..a77bbb8746ceed6e9fe571928bd4f56ba5c4bd1d 100644 (file)
--- a/util/demux.c
+++ b/util/demux.c
AVBitStreamFilterContext *bsf = NULL;
struct demux *demux;
- if ((cc->codec_id != CODEC_ID_H264) && (cc->codec_id != CODEC_ID_MPEG2VIDEO) && ( cc->codec_id != CODEC_ID_MPEG4)){
+ if ((cc->codec_id != AV_CODEC_ID_H264) && (cc->codec_id != AV_CODEC_ID_MPEG2VIDEO) && ( cc->codec_id != AV_CODEC_ID_MPEG4)){
ERROR("could not open '%s': unsupported codec %d", filename, cc->codec_id);
return NULL;
}
av_register_all();
avcodec_register_all();
demux = open_stream(filename, width, height);
- if ((demux != NULL) && (demux->cc->codec_id == CODEC_ID_MPEG4)) {
+ if ((demux != NULL) && (demux->cc->codec_id == AV_CODEC_ID_MPEG4)) {
if(get_esds_offset(filename, demux))
return NULL;
}
void demux_deinit(struct demux *demux)
{
- av_close_input_file(demux->afc);
+ avformat_close_input(demux->afc);
if (demux->bsf)
av_bitstream_filter_close(demux->bsf);
free(demux->esds.data);