bump ffmpeg from git-185a155 to git-0b32da9

[handbrake-jp/handbrake-jp-git.git] / libhb / stream.c

diff --git a/libhb/stream.c b/libhb/stream.c
index bd2cee3..4c11841 100644 (file)
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -1557,10 +1557,6 @@ static void set_audio_description( hb_audio_t *audio, iso639_lang_t *lang )
     {
         AVCodec *codec = avcodec_find_decoder( cc->codec_id );
         codec_name = codec->name;
-        if ( !strcmp( codec_name, "LIBFAAD" ) )
-        {
-            codec_name = "AAC";
-        }
         if ( !strcmp( codec_name, "DCA" ) )
         {
             codec_name = "DTS";
@@ -2946,7 +2942,7 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title )
         // we're opening for scan. let ffmpeg put some info into the
         // log about what we've got.
         av_log_set_level( AV_LOG_INFO );
-        dump_format( ic, 0, stream->path, 0 );
+        av_dump_format( ic, 0, stream->path, 0 );
         av_log_set_level( AV_LOG_ERROR );
 
         // accept this file if it has at least one video stream we can decode