diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:39:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-22 14:39:12 +0200 |
| commit | e3a91c51f7136c1bfd96f71b177b693e08427880 (patch) | |
| tree | a9ceea95293f4622d5934672ac0004f43972833c /libavformat/rtpdec.c | |
| parent | c3778df2d4c05e76d28d77a2d740e435393046c9 (diff) | |
| parent | c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4 (diff) | |
| download | ffmpeg-e3a91c51f7136c1bfd96f71b177b693e08427880.tar.gz | |
Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'
* commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
rtpdec: Don't pass a non-AVClass pointer as log context
rtsp: Update a comment to the current filename scheme
avcodec: handle AVERROR_EXPERIMENTAL
avutil: Add AVERROR_EXPERIMENTAL
avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavformat/rtpdec.c
libavutil/error.c
libavutil/error.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index c62c2a932a..963a3170e0 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -788,7 +788,7 @@ int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p, int value_size = strlen(p) + 1; if (!(value = av_malloc(value_size))) { - av_log(stream, AV_LOG_ERROR, "Failed to allocate data for FMTP.\n"); + av_log(NULL, AV_LOG_ERROR, "Failed to allocate data for FMTP.\n"); return AVERROR(ENOMEM); } |