diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:55:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 23:55:51 +0100 |
| commit | efb5ebe83258ad4b4f610c93b690c63da2fb57a3 (patch) | |
| tree | 2cabc37e25b8147bf3c8d58630f7978c3d23455e /libavcodec | |
| parent | 5a15bd6f2f40253dbc5d4add783d29cbe673aa97 (diff) | |
| parent | b06c8bce02b15115a4789252365df2dda0c4713c (diff) | |
| download | ffmpeg-efb5ebe83258ad4b4f610c93b690c63da2fb57a3.tar.gz | |
Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'
* commit 'b06c8bce02b15115a4789252365df2dda0c4713c':
mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7380af05c9..6ed0f2e4ee 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1423,7 +1423,6 @@ int ff_find_unused_picture(MpegEncContext *s, int shared) s->picture[ret].needs_realloc = 0; ff_free_picture_tables(&s->picture[ret]); ff_mpeg_unref_picture(s, &s->picture[ret]); - avcodec_get_frame_defaults(&s->picture[ret].f); } } return ret; |