mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/max_10/libstb-hal-max

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 3af3d5adb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-01 (Fri, 01 Mar 2019)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-03-01 18:39:36 +01:00
parent b5186e35be 017dbeb28c
commit 155b3922eb
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libarmbox/video.cpp
View File

@@ -257,13 +257,17 @@ int decode_frame(AVCodecContext *codecContext,AVPacket &packet, int fd)
AVCodecContext* open_codec(AVMediaType mediaType, AVFormatContext* formatContext)
{
int stream_index = av_find_best_stream(formatContext, mediaType, -1, -1, NULL, 0);
if (stream_index >=0 ){
AVCodecContext * codecContext = formatContext->streams[stream_index]->codec;
if(codecContext){
AVCodec *codec = avcodec_find_decoder(codecContext->codec_id);
if(codec){
if ((avcodec_open2(codecContext, codec, NULL)) != 0){
AVCodec * codec = NULL;
AVCodecContext * codecContext = NULL;
int stream_index;
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ))
stream_index = av_find_best_stream(formatContext, mediaType, -1, -1, NULL, 0);
if (stream_index >= 0) {
codecContext = formatContext->streams[stream_index]->codec;
if (codecContext) {
codec = avcodec_find_decoder(codecContext->codec_id);
if (codec) {
if ((avcodec_open2(codecContext, codec, NULL)) != 0) {
return NULL;
}
}
@@ -271,6 +275,22 @@ AVCodecContext* open_codec(AVMediaType mediaType, AVFormatContext* formatContext
}
}
return NULL;
#else
stream_index = av_find_best_stream(formatContext, mediaType, -1, -1, &codec, 0);
if (stream_index >= 0) {
codec = avcodec_find_decoder(formatContext->streams[stream_index]->codecpar->codec_id);
if (codec) {
codecContext = avcodec_alloc_context3(codec);
}
if (codecContext) {
if ((avcodec_open2(codecContext, codec, NULL)) != 0) {
return NULL;
}
return codecContext;
}
}
return NULL;
#endif
}
int image_to_mpeg2(const char *image_name, int fd)