diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-22 20:05:03 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-22 20:05:03 +0200 |
| commit | 7475a9351f57a157cddf47db7a00b7922c7bd994 (patch) | |
| tree | c322202e0a64f71aee2d039e6a6c28799f4d790b /libavfilter/af_resample.c | |
| parent | 575be7311cff2c958ca289df408d3e9ce2e2b1c0 (diff) | |
| parent | d338abb664febbc2c7266af7818aab1f12dbc161 (diff) | |
| download | ffmpeg-7475a9351f57a157cddf47db7a00b7922c7bd994.tar.gz | |
Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'
* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL
This commit is a noop.
Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/af_resample.c')
0 files changed, 0 insertions, 0 deletions