Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reversions from MythTV 923 #13

Open
wants to merge 3 commits into
base: release/5.1
Choose a base branch
from
Open

Reversions from MythTV 923 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20306e5
libavformat/demux.c: remove errant doxygen comment
ulmus-scott Jun 24, 2024
648010f
Revert "fix non UTF-8 files (external)"
ulmus-scott Jun 24, 2024
267d948
libavcodec/v4l2_buffers.c: revert unnecessary change
ulmus-scott Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libavcodec/v4l2_buffers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ static uint8_t * v4l2_get_drm_frame(V4L2Buffer *avbuf)
}
#endif

static void v4l2_free_buffer(void *opaque, uint8_t *data)
static void v4l2_free_buffer(void *opaque, uint8_t *unused)
{
V4L2Buffer* avbuf = opaque;
V4L2m2mContext *s = buf_to_m2mctx(avbuf);
Expand Down
5 changes: 0 additions & 5 deletions libavformat/demux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,11 +1240,6 @@ static int64_t ts_to_samples(AVStream *st, int64_t ts)
return av_rescale(ts, st->time_base.num * st->codecpar->sample_rate, st->time_base.den);
}

/**
* Simply sets data pointer to null.
*
* This will leak memory if no one else frees the memory used by the packet.
*/
static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
{
FFFormatContext *const si = ffformatcontext(s);
Expand Down
8 changes: 4 additions & 4 deletions tools/clean-diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ sed '/^+[^+]/!s/ /TaBBaT/g' |\
sed 's/TaBBaT/ /g' |\
sed '/^+[^+]/s/ * $//' |\
tr -d '\015' |\
tr '\n' '°' |\
sed 's/\(@@[^@]*@@°[^@]*\)/\n\1/g' |\
egrep -v '@@[^@]*@@°(( [^°]*°)|([+-][[:space:]]*°)|(-[[:space:]]*([^°]*)°\+[[:space:]]*\5°))*$' |\
tr '\n' '�' |\
sed 's/\(@@[^@]*@@�[^@]*\)/\n\1/g' |\
egrep -v '@@[^@]*@@�(( [^�]*�)|([+-][[:space:]]*�)|(-[[:space:]]*([^�]*)�\+[[:space:]]*\5�))*$' |\
tr -d '\n' |\
tr '°' '\n'
tr '�' '\n'